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

疯狂的狮子li

2022-01-04 92653f3deb3f0f03ee9bfef3e9322fb94c90938c

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java

@@ -1,5 +1,6 @@
package com.ruoyi.common.core.domain.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.TreeEntity;
@@ -65,6 +66,7 @@
     * 路由参数
     */
   @ApiModelProperty(value = "路由参数")
    @TableField("`query`")
    private String query;

   /**