Merge remote-tracking branch 'origin/master'

zuojincheng

2025-06-24 07386c2258263d8f9c357f581d2ec2f3a4696cbf

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

@@ -69,7 +69,7 @@
        }
       if(loss != null && loss == 1){
            txt += (hasTxt?"、":"") + "漏损报警" ;
           hasTxt = true ;
            hasTxt = true ;
        }
        return txt ;
    }