解决git冲突

liurunyu

2024-07-25 a37271af0a5a2eb04ca23c80cca32567c968fa8e

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

@@ -19,7 +19,7 @@
    public DataStateVo stateVo ;//状态
    public String toString(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("   终端自报实时数据:\n");
        sb.append("   终端自报(整点)实时数据:\n");
        sb.append("      瞬时流量：");
        sb.append(instantAmount==null?"":instantAmount);
        sb.append("\n");