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

kaiyu

2021-04-16 6ebf2b2a84b903f3600238dd084b3ae9ee4d6d3b

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

@@ -75,6 +75,12 @@
    private String isDelete;

    /*
    * 描述
    * */
    @TableField(value = "`desc`")
    private String desc;

    /*
    * 二级菜单
    * */
    @TableField(exist = false)