Merge branch 'cjl' into dev

cjl

2025-01-06 27e6bc3df3e39e0d0b147b155a89ad6837ea972b

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

}