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

Junjie

2024-01-09 584a10477ffa1f670d07a05401ab7ec2c696204a

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

@@ -11,7 +11,7 @@

    @Override
    public WrkCharge selectWorking(Integer shuttleNo) {
        return this.baseMapper.selectWorkingOfCharge(shuttleNo);
        return this.baseMapper.selectWorking(shuttleNo);
    }

    @Override