Merge branch 'wb' into qa

cjl

2023-09-27 f0a5a28345ed6764ac033a585f1e6b7cbcf8d102

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

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


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

}