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

cjl

2023-09-28 8eb4ae5aee53a2529c759d95dd529d91dd25ba1d

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

}