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

jinpengyong

2023-08-22 e6f974ca6eab798c2df5c09cdb8320ecf4ff4185

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

@@ -60,10 +60,4 @@
     */
    private String isDelete;


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

}