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

zyx

2024-04-12 b922fe4d80f7e278b1ff958c4c95626b27cf8266

 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