Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-10-23 d26d1fba7d3f8db6eb87f9da6c25b8a98de6e1ea

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

}