Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud

 Conflicts:

	README.md

	pom.xml

	ruoyi-api/pom.xml

	ruoyi-api/ruoyi-api-resource/pom.xml

	ruoyi-api/ruoyi-api-system/pom.xml

	ruoyi-auth/pom.xml

	ruoyi-common/pom.xml

	ruoyi-common/ruoyi-common-core/pom.xml

	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java

	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java

	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java

	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java

	ruoyi-common/ruoyi-common-log/pom.xml

	ruoyi-common/ruoyi-common-mybatis/pom.xml

	ruoyi-common/ruoyi-common-redis/pom.xml

	ruoyi-common/ruoyi-common-security/pom.xml

	ruoyi-common/ruoyi-common-swagger/pom.xml

	ruoyi-gateway/pom.xml

	ruoyi-modules/pom.xml

	ruoyi-modules/ruoyi-gen/pom.xml

	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm

	ruoyi-modules/ruoyi-job/pom.xml

	ruoyi-modules/ruoyi-resource/pom.xml

	ruoyi-modules/ruoyi-system/pom.xml

	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

	ruoyi-ui/package.json

	ruoyi-ui/src/views/index.vue

	ruoyi-visual/pom.xml

	ruoyi-visual/ruoyi-monitor/pom.xml

ruoyi-ui/src/plugins/tab.js

@@ -55,10 +55,10 @@ export default {
     return store.dispatch('tagsView/delOthersViews', obj || router.currentRoute);
   },
   // 添加tab页签
-  openPage(title, url) {
+  openPage(title, url, params) {
     var obj = { path: url, meta: { title: title } }
     store.dispatch('tagsView/addView', obj);
-    return router.push(url);
+    return router.push({ path: url, query: params });
   },
   // 修改tab页签
   updatePage(obj) {