Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

Administrator

2024-06-27 5447abaae60e4d8d98c52c952a10d9c4ad6c06d6

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

@@ -6,7 +6,7 @@
public class DataAlarmVo {
    public Byte batteryVolt ;// 蓄电池电压
    public Byte loss ;//漏损
    public Byte meter ;//仪表
    public Byte meter ;//流量计故障
    public Byte valve ;//阀门

    public String toString(){
@@ -18,7 +18,7 @@
        str.append("         漏损：");
        str.append(loss==null?"":(loss==1?"报警":"正常"));
        str.append("\n");
        str.append("         仪表：");
        str.append("         流量计故障：");
        str.append(meter==null?"":(meter==1?"报警":"正常"));
        str.append("\n");
        str.append("         阀门：");