Merge remote-tracking branch 'origin/master'

wuzeyu

2024-05-15 fbd4cf5aeb4274938c12030e5d235c65c20c19c3

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_56_Up.java

@@ -62,13 +62,13 @@
        cdData.controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ;

        index++ ;
        cdData.projectNo = 0 + bs[index];
        cdData.projectNo = (int)bs[index];

        index++ ;
        cdData.waterAlarm = ByteUtilUnsigned.bytes2Short_BE(bs, index) ;
        cdData.waterAlarm = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;

        index += 2 ;
        cdData.moneyAlarm = ByteUtilUnsigned.bytes2Short_BE(bs, index) ;
        cdData.moneyAlarm = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;

    }
}