Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-redis

� Conflicts:
�	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java
�	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java

Author: YunaiV

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yudao-ui-admin",
-  "version": "1.7.3-snapshot",
+  "version": "1.8.0-snapshot",
   "description": "芋道管理系统",
   "author": "芋道",
   "license": "MIT",

src/components/Crontab/week.vue

@@ -185,7 +185,7 @@ export default {
 		averageTotal: function () {
 			this.average01 = this.checkNum(this.average01, 1, 4)
 			this.average02 = this.checkNum(this.average02, 1, 7)
-			return this.average02 + '#' + this.average01;
+			return this.average01 + '#' + this.average02;
 		},
 		// 最近的工作日（格式）
 		weekdayCheck: function () {