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

1

14 小时以前 5e567919108b4e1c914cdb1aae5d91ff2eb337d7

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

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

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