Merge branch 'hylywcs' of http://47.97.1.152:5880/r/zy-wcs into hylywcs

18516761980

2022-08-12 d250ca5d40e6b28c7f79c3d8ea724f039288dec3

 src/main/java/com/zy/core/ServerBootstrap.java

@@ -77,7 +77,7 @@
        // 初始化堆垛机线程
        log.info("初始化堆垛机线程...................................................");
        for (CrnSlave crn : slaveProperties.getCrn()) {
            CrnThread crnThread = new MelsecCrnThread(crn);
            CrnThread crnThread = new SiemensCrnThread(crn);
            new Thread((Runnable) crnThread).start();
            SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
        }