From cd45cee236780a8e02244d8d8a916088ca002d3d Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期一, 06 五月 2024 16:06:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_21_Up.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_21_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_21_Up.java index 7a7948d..b3d5d9f 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_21_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_21_Up.java @@ -59,7 +59,7 @@ protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception { DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ; DataCd21Vo cdData = new DataCd21Vo() ; - dV1.dataCd21Vo = cdData ; + dV1.subData = cdData ; short index = ProtocolConstantV206V1_0_0.dataIndex ; String ip1 = "" +ByteUtilUnsigned.byte2Byte(bs, index++) ; String ip2 = "" +ByteUtilUnsigned.byte2Byte(bs, index++) ; -- Gitblit v1.8.0