From 88cd0922634e6bb20da6ea64209bd62d094b6b4c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十二月 2023 15:05:57 +0800
Subject: [PATCH] 测试git冲突
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataV1_0_1.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataV1_0_1.java
index 78675d2..c8c3116 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataV1_0_1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataV1_0_1.java
@@ -25,6 +25,21 @@
if(dataCd02Vo != null){
sb.append(dataCd02Vo.toString()) ;
}
+ if(dataCdC0Vo != null){
+ sb.append(dataCdC0Vo.toString()) ;
+ }
+ if(dataCd83OpenVo != null){
+ sb.append(dataCd83OpenVo.toString()) ;
+ }
+ if(dataCd83CloseVo != null){
+ sb.append(dataCd83CloseVo.toString()) ;
+ }
+ if(dataCd84Vo != null){
+ sb.append(dataCd84Vo.toString()) ;
+ }
+ if(dataCd71Vo != null){
+ sb.append(dataCd71Vo.toString()) ;
+ }
return sb.toString() ;
}
}
--
Gitblit v1.8.0