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

whycq

2022-08-30 ea9a3f176e8ff0a0cf96762c7948c7f037e56b23

 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);
        }