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

Junjie

2023-12-06 828b592b5f8e31204f93bcc2ea0c5866bdc0dcf0

 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);
        }
    }