Skip to content

Commit 5eabf6a

Browse files
committed
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/flowable
2 parents 5e3a7f9 + f8b6d74 commit 5eabf6a

File tree

13 files changed

+10664
-10381
lines changed

13 files changed

+10664
-10381
lines changed

.env.development

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ VUE_APP_BASE_API = '/dev-api'
1010

1111
# 路由懒加载
1212
VUE_CLI_BABEL_TRANSPILE_MODULES = true
13+
14+
# 多租户的开关
15+
VUE_APP_TENANT_ENABLE = true

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ selenium-debug.log
2020
*.local
2121

2222
package-lock.json
23-
yarn.lock

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "yudao-ui-admin",
3-
"version": "1.5.0-snapshot",
3+
"version": "1.5.1-snapshot",
44
"description": "芋道管理系统",
55
"author": "芋道",
66
"license": "MIT",
@@ -40,7 +40,7 @@
4040
"@riophae/vue-treeselect": "0.4.0",
4141
"axios": "0.24.0",
4242
"clipboard": "2.0.8",
43-
"core-js": "3.19.1",
43+
"core-js": "^3.21.1",
4444
"echarts": "4.9.0",
4545
"element-ui": "^2.15.6",
4646
"file-saver": "2.0.5",

0 commit comments

Comments
 (0)