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

whycq

2023-12-08 d52f307dd07cd6c2c33fa2154935402556d5ea7c

 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