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

chenxi

2023-05-27 58972583c9f82237068c12a8d8b92e85e8af3c55

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

}