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

jinpengyong

2021-05-27 d666793c93e91026e129f00bae414217690635ae

 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)