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

whycq

2022-03-18 afe777a76ae3448a53986aac22b3a667a21c64c7

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -835,7 +835,7 @@
        }

        // 已经存在吊车执行任务时，则过滤
        if (wrkMastMapper.selectLocMoving(slave.getId()) != null) {
        if (wrkMastMapper.selectWorking(slave.getId()) != null) {
            return;
        }