Merge remote-tracking branch 'origin/master'

wuzeyu

2024-06-11 99ea8b4fc0d7fdd866797b33c7ce773730d42afa

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd84Vo.java

File was renamed from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd84Vo.java
@@ -1,5 +1,6 @@
package com.dy.common.mw.protocol.p206V1_0_0;
package com.dy.common.mw.protocol.p206V1_0_0.upVos;

import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
import lombok.Data;

/**
@@ -24,7 +25,7 @@
        StringBuilder sb = new StringBuilder() ;
        sb.append("   终端开阀工作报:\n");
        sb.append("      开阀类型：");
        sb.append(opType==null?"未知":CommonV1_0_1.openCloseValveType(opType));
        sb.append(opType==null?"未知": CommonV1_0_1.openCloseValveType(opType));
        sb.append("\n");
        sb.append("      IC卡类型：");
        sb.append(cardType==null?"未知":CommonV1_0_1.icCardType(cardType)) ;