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

chen_xi

2022-09-27 f4ab89e7032bea8d3c7e05a44946c3fdb58b7473

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

}