Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

 Conflicts:

	pom.xml

	ruoyi-admin/pom.xml

	ruoyi-admin/src/main/resources/application.yml

	ruoyi-common/pom.xml

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

	ruoyi-framework/pom.xml

	ruoyi-generator/pom.xml

	ruoyi-quartz/pom.xml

	ruoyi-system/pom.xml

	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java

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

	ruoyi-ui/package.json

	ruoyi-ui/src/components/ImageUpload/index.vue

	ruoyi-ui/src/components/ThemePicker/index.vue

	ruoyi-ui/src/layout/components/Sidebar/Link.vue

	ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue

	ruoyi-ui/src/router/index.js

	ruoyi-ui/src/views/index.vue

	ruoyi-ui/src/views/tool/gen/editTable.vue

	ruoyi-ui/src/views/tool/gen/index.vue

	sql/ry_20210908.sql

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java

@@ -41,6 +41,11 @@ public class RouterVo {
      */
     private String component;
 
+    /**
+     * 路由参数：如 {"id": 1, "name": "ry"}
+     */
+    private String query;
+
     /**
      * 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
      */

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -135,6 +135,7 @@ public class SysMenuServiceImpl extends ServicePlusImpl<SysMenuMapper, SysMenu,
             router.setName(getRouteName(menu));
             router.setPath(getRouterPath(menu));
             router.setComponent(getComponent(menu));
+            router.setQuery(menu.getQuery());
             router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
             List<SysMenu> cMenus = menu.getChildren();
             if (!cMenus.isEmpty() && UserConstants.TYPE_DIR.equals(menu.getMenuType())) {

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

@@ -12,7 +12,8 @@
         <result property="orderNum" column="order_num"/>
         <result property="path" column="path"/>
         <result property="component" column="component"/>
-        <result property="isFrame" column="is_frame"/>
+		<result property="query" column="query"/>
+		<result property="isFrame" column="is_frame"/>
         <result property="isCache" column="is_cache"/>
         <result property="menuType" column="menu_type"/>
         <result property="visible" column="visible"/>
@@ -33,6 +34,7 @@
                order_num,
                path,
                component,
+			   query,
                is_frame,
                is_cache,
                menu_type,
@@ -51,7 +53,8 @@
                         m.menu_name,
                         m.path,
                         m.component,
-                        m.visible,
+						m.query,
+						m.visible,
                         m.status,
                         ifnull(m.perms, '') as perms,
                         m.is_frame,
@@ -67,7 +70,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.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
@@ -92,6 +95,7 @@
                         m.menu_name,
                         m.path,
                         m.component,
+					    m.query,
                         m.visible,
                         m.status,
                         ifnull(m.perms, '') as perms,