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

lty

12 小时以前 4bb523147bc6e9fef20142d1389c893f97321e02

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

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

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