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

zyx

2023-12-07 ccbf7105edf18752ab64871d6112abd4f96cf8d4

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

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