Merge remote-tracking branch 'origin/wb' into qa

cjl

2023-09-26 6c2fe039f3a0c9cfd0e84ffe83a0961bb5991d95

 screen-api/src/main/java/com/moral/api/entity/UserGroup.java

@@ -61,9 +61,4 @@
    private String isDelete;


    @Override
    protected Serializable pkVal() {
        return this.id;
    }

}