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

zyx

2023-12-14 e3ac6e0be187f4eb63cf9707c7a5bead854305f1

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

@@ -256,7 +256,7 @@
    }

    public static void main(String[] args) {
        System.out.println(JSON.toJSONString(getGroupDeepLoc("1505908")));
        System.out.println(JSON.toJSONString(getGroupInnerLoc("1505908")));
    }

    /**
@@ -441,7 +441,7 @@
        if(Cools.isEmpty(condition) || "null".equals(condition)){
            wrapper.andNew().eq(column,"").or().isNull(column);
        }else {
            wrapper.eq(column,condition);
            wrapper.andNew().eq(column,condition);
        }
    }