Merge branch 'cjl' into dev

cjl

2025-01-06 27e6bc3df3e39e0d0b147b155a89ad6837ea972b

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

@@ -57,6 +57,7 @@
    /**
     * 同一级别菜单的顺序
     */
    @TableField(value = "`order`")
    private Integer order;

    /**
@@ -86,9 +87,5 @@
    @TableField(exist = false)
    private List<ManageMenu> children;

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

}