jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-ui/package.json
This commit is contained in:
疯狂的狮子li
2020-08-13 11:24:04 +08:00
parent 3aaff7b776 8f9f0c04cc
commit 088bc98a43
10 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -3,7 +3,7 @@ ruoyi:
# 名称
name: RuoYi
# 版本
version: 3.0.0
version: 3.1.0
# 版权年份
copyrightYear: 2019
# 实例演示开关