Merge branch 'refs/heads/rcs_master' into jdxaj

zhang

6 小时以前 70930071a49190f414c8d8bc9c9e9795a4096739

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java

@@ -58,7 +58,7 @@
            if (dto.getPriority() == 9527) {
                if (Cools.isEmpty(dto.getDestLoc())) {
                    List<Loc> locList = locService.list(new LambdaQueryWrapper<Loc>()
                            .ge(Loc::getRow, 31).eq(Loc::getLocSts, LocStsType.IDLE.val()));
                            .ge(Loc::getRowNo, 31).eq(Loc::getLocSts, LocStsType.IDLE.val()));
                    if (Cools.isEmpty(locList)) {
                        log.error("there is no such idle loc");
                        break;