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

王佳豪

2021-06-03 a1844a7fc934ca943db810b1bd2a450f948607cd

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

@@ -18,8 +18,8 @@
    private RowLastnoService rowLastnoService;

    @Override
    public LocMast queryFreeLocMast(Integer row) {
        return this.baseMapper.queryFreeLocMast(row);
    public LocMast queryFreeLocMast(Integer row, Short locType1) {
        return this.baseMapper.queryFreeLocMast(row, locType1);
    }

    @Override