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

whycq

2023-10-18 bb5bb4094dfc9c4a691692d0275cb24bedbc732c

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

@@ -230,7 +230,7 @@

    private void wapperSetCondition(Wrapper wrapper,String column, String condition){
        if(Cools.isEmpty(condition)){
            wrapper.isNull(column);
            wrapper.andNew().eq(column,"").or().isNull(column);
        }else {
            wrapper.eq(column,condition);
        }