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

1

4 天以前 db5a7b95e4a13fd9cf993c2e79b8c77e479b2514

 src/main/java/com/zy/asrs/task/ArmRulesScheduler.java

@@ -29,7 +29,7 @@
    @Autowired
    private ArmRulesHandler armRulesHandler;

    @Scheduled(cron = "0/3 * * * * ? ")
    @Scheduled(cron = "0 0 * * * ? ")
    private void execute(){
        List<BasArmRules> basArmRules = basArmRulesService.AllStatusSatisfyBasArmRules(0);
        if (basArmRules.isEmpty()) {