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

jinpengyong

2023-09-15 cc2e35bac3aca6d98b337a0b306c279f036ce989

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

}