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

jinpengyong

2023-09-22 3271a0e7421aa7c55f475be8f24ad85b576108b8

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

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


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

}