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

 Conflicts:

	pom.xml

	ruoyi-admin/pom.xml

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

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

	ruoyi-common/pom.xml

	ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java

	ruoyi-framework/pom.xml

	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

	ruoyi-generator/pom.xml

	ruoyi-quartz/pom.xml

	ruoyi-system/pom.xml

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

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

	ruoyi-ui/package.json

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

	ruoyi-ui/src/layout/components/AppMain.vue

	ruoyi-ui/src/router/index.js

	ruoyi-ui/src/store/modules/permission.js

	ruoyi-ui/src/views/index.vue

ruoyi-ui/src/layout/components/AppMain.vue

@@ -51,7 +51,7 @@ export default {
 // fix css style bug in open el-dialog
 .el-popup-parent--hidden {
   .fixed-header {
-    padding-right: 15px;
+    padding-right: 17px;
   }
 }
 </style>

ruoyi-ui/src/layout/components/InnerLink/index.vue

@@ -0,0 +1,27 @@
+<script>
+export default {
+  data() {
+    return {};
+  },
+  render() {
+    const { $route: { meta: { link } }, } = this;
+    if ({ link }.link === "") {
+      return "404";
+    }
+    let url = { link }.link;
+    const height = document.documentElement.clientHeight - 94.5 + "px";
+    const style = { height: height };
+
+    return (
+      <div style={style}>
+        <iframe
+          src={url}
+          frameborder="no"
+          style="width: 100%; height: 100%"
+          scrolling="auto"
+        ></iframe>
+      </div>
+    );
+  },
+};
+</script>