Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-13 d02a6b2cf6f0030456fd7ea568570f3df0dd7291

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

@@ -25,7 +25,8 @@

    @Override
    public List<ManPakOut> selectByLocType(String locType) {
        return this.selectList(new EntityWrapper<ManPakOut>().like("loc_no",locType).eq("status",1));
        return this.selectList(new EntityWrapper<ManPakOut>().like("loc_no",locType+"-")
                .andNew().eq("status",0).or().eq("status",8));
    }

    @Override