Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

zyx

2023-12-04 fdf2903b8944b80877e7df5d0da38f34b5d84ed9

 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