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

cjl

2023-10-27 d8a01a15bf6f310734a18eb7740c7f5ef2d19736

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

}