Merge remote-tracking branch 'origin/sxjzwcs' into sxjzwcs

whycq

2024-06-30 f884d266dce2295e75462e931f7fb60eb2c23c80

 src/main/java/com/zy/core/MainProcess.java

@@ -70,6 +70,9 @@

                    mainService.outOfDevp(11);

                    // 复位一期led入库后显示默认信息
//                    mainService.resetOneLed();

                    //mainService.DevpCallThePolice(12);