Merge remote-tracking branch 'origin/master'

Administrator

2023-12-07 1fbf81e162e6e16ffd927b736c3192ea3023c88e

 pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/console/Command.java

@@ -108,6 +108,9 @@
               if(sta.count != null){
                  prtWrt.println("    已经上报数据：" + sta.count + "条");
               }
               if(sta.overCount != null){
                  prtWrt.println("    已经完成上报数据：" + sta.overCount + "台RTU");
               }
               if(sta.over != null && sta.over){
                  prtWrt.println("    上报数据已经完成，共用时：" + sta.seconds + "秒");
               }