Merge remote-tracking branch 'origin/czscwcs-version' into czscwcs-version

zwl

2025-07-01 4958451d972b1872d8e852b6c3c3446e700bd806

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

@@ -59,8 +59,8 @@
    }

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

    @Override