hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-25 00:15:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
 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
This commit is contained in:
YunaiV
2023-07-28 22:31:18 +08:00
parent 414c1be128 418ae829da
commit 95edd1d451
243 changed files with 3417 additions and 1230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-ui-admin/package.json
View File

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

2
yudao-ui-admin/src/components/Crontab/week.vue
View File

@ -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 () {