Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.star-rising.cn/Song/xkrs_ms

Browse Source 
# Conflicts:
#	ruoyi-admin/src/main/resources/application-druid.yml
#	ruoyi-admin/src/main/resources/application.yml
This commit is contained in:
songjinsheng
2022-05-11 17:27:34 +08:00
parent 9facc1b682 93835778ad
commit f2cb431c90
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/package.json
View File

@ -39,7 +39,7 @@
"@riophae/vue-treeselect": "0.4.0",
"axios": "0.24.0",
"clipboard": "2.0.8",
"core-js": "3.19.1",
"core-js": "^3.19.1",
"echarts": "4.9.0",
"element-ui": "2.15.8",
"file-saver": "2.0.5",