Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs-auto

whycq

2025-01-02 00620a6917d2c4b0df1f62366a489cfe6aed8be1

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

@@ -40,6 +40,11 @@
    }

    @Override
    public LocMast queryDemoSourceLoc1(Integer crn) {
        return this.baseMapper.queryDemoSourceLoc1(crn);
    }

    @Override
    public LocMast queryDemoLoc(Integer crn) {
        return this.baseMapper.queryDemoLoc(crn);
    }
@@ -50,6 +55,11 @@
    }

    @Override
    public LocMast queryDemoLoc2(Integer crn, short locType1) {
        return this.baseMapper.queryDemoLoc2(crn,locType1);
    }

    @Override
    public Boolean checkEmptyCount(LocMast locMast) {
        if (locMast == null) {
            return false;