Merge remote-tracking branch 'origin/master'

wuzeyu

2024-01-15 835ac4c14a2ae8d17578e2b7bbbaa54d5a12f40a

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java

@@ -135,7 +135,6 @@
        Date operateTime = new Date();
        prController.setOperatedt(operateTime);
        prController.setDeleted((byte)0);
        prController.setOnlinestate((byte)2);
        prController.setReporttime(operateTime);
        Integer rec = Optional.ofNullable(controllerSv.addController(prController)).orElse(0);
        if(rec == 0) {