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

whycq

2023-10-18 bb5bb4094dfc9c4a691692d0275cb24bedbc732c

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -387,7 +387,7 @@
    }

    public static void wapperSetCondition(Wrapper wrapper, String column, String condition){
        if(Cools.isEmpty(condition)){
        if(Cools.isEmpty(condition) || "null".equals(condition)){
            wrapper.andNew().eq(column,"").or().isNull(column);
        }else {
            wrapper.eq(column,condition);