Merge branch 'refs/heads/rcs_master' into jdxaj

zhang

16 小时以前 70930071a49190f414c8d8bc9c9e9795a4096739

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

@@ -25,7 +25,7 @@
import java.util.*;

@Slf4j
@Component
//@Component
public class ConveyorAutoRunScheduler {

    private static final AgvModelType DEFAULT_AGV_MODEL = AgvModelType.CTU_BOX_TRANSPORT_AGV;