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 into dev

Browse Source 
 Conflicts:
	ruoyi-ui/src/views/monitor/druid/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/tool/swagger/index.vue
This commit is contained in:
疯狂的狮子li
2021-06-22 16:56:38 +08:00
parent f098222a43 253e2b2de1
commit c822e2f6cc
7 changed files with 164 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ry.sh
View File

@ -3,7 +3,7 @@
# ./ry.sh start 启动
# ./ry.sh stop 停止
# ./ry.sh restart 重启
# ./ry.sh start 状态
# ./ry.sh status 状态
AppName=ruoyi-admin.jar
# JVM参数