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

whycq

2023-01-08 30b2d8dde49639824f2a9c8f5b3e9b99b4b09e80

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

@@ -31,8 +31,8 @@
        return this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
    }
    @Override
    public List<LocMast> queryFreeLocMast2(List<Integer> rows, Integer rowsLen, Short locType1,Boolean inoutEveryday) {
        return this.baseMapper.queryFreeLocMast2(rows, rowsLen, locType1,inoutEveryday);
    public List<LocMast> queryFreeLocMast0(List<Integer> rows, Integer rowsLen, Short locType1,Boolean inoutEveryday) {
        return this.baseMapper.queryFreeLocMast0(rows, rowsLen, locType1,inoutEveryday);
    }

    @Override