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

jinpengyong

2023-11-07 dab06e44d031aac4a951cfb01ba9545cc4772fa2

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

}