fix 修复sql关键字处理 防止解析器报错

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 @@ public class SysMenu extends TreeEntity {
      * 路由参数
      */
 	@ApiModelProperty(value = "路由参数")
+    @TableField("`query`")
     private String query;
 
 	/**

ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -27,33 +27,13 @@
         <result property="remark" column="remark"/>
     </resultMap>
 
-    <sql id="selectMenuVo">
-        select menu_id,
-               menu_name,
-               parent_id,
-               order_num,
-               path,
-               component,
-			   query,
-               is_frame,
-               is_cache,
-               menu_type,
-               visible,
-               status,
-               ifnull(perms, '') as perms,
-               icon,
-               create_time
-        from sys_menu
-    </sql>
-
-
     <select id="selectMenuTreeAll" resultMap="SysMenuResult">
         select distinct m.menu_id,
                         m.parent_id,
                         m.menu_name,
                         m.path,
                         m.component,
-						m.query,
+						m.`query`,
 						m.visible,
                         m.status,
                         ifnull(m.perms, '') as perms,
@@ -70,7 +50,7 @@
     </select>
 
     <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
-        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status,
+        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status,
         ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
         from sys_menu m
         left join sys_role_menu rm on m.menu_id = rm.menu_id
@@ -95,7 +75,7 @@
                         m.menu_name,
                         m.path,
                         m.component,
-					    m.query,
+					    m.`query`,
                         m.visible,
                         m.status,
                         ifnull(m.perms, '') as perms,