Merge branch 'rcs_master_1.0' into rcs_master_all

zhang

2 天以前 14f2c4fce50c871d84f89d2dca2298e0892b4672

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/test/AutoRunScheduler.java

@@ -82,8 +82,7 @@

    private void autoRun(AgvModel agvModel) {

        List<String> staPreNos = new ArrayList<>();
        String memo = "DEMO_STA_" + String.join("-", staPreNos);
        String memo = "TEST" ;
        String taskAssignModeArea = configService.getVal("TaskAssignModeArea", String.class);
        if (Cools.isEmpty(taskAssignModeArea)) {
            return;