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

zyx

2023-12-12 f8bdc51fe4c57a250fb1240056d767883b7d6739

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

@@ -239,7 +239,7 @@
        if(Cools.isEmpty(condition)){
            wrapper.andNew().eq(column,"").or().isNull(column);
        }else {
            wrapper.eq(column,condition);
            wrapper.andNew().eq(column,condition);
        }
    }