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

jinpengyong

2023-08-22 6eb8f65d4a69a550945a92cc916d3c63dee739fa

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

}