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

whycq

2022-03-16 e1ab7f1517041275be4b2e30210b2b65736b9d4a

 src/main/java/com/zy/core/thread/MelsecCrnThread.java

@@ -198,7 +198,6 @@
                    }
                }


                // 根据实时信息更新数据库
                BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
                BasCrnp basCrnp = new BasCrnp();