Merge remote-tracking branch 'origin/wb' into wb

jinpengyong

2023-09-26 b9086588c215b7493682d65d49ed1070d88c3058

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

}