Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-06-16 d6ca891b09de6095308a5d948ff4de8b7dde78b1

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

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

    /**