xiaozhi/xiaozhi-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
 Conflicts:
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
This commit is contained in:
疯狂的狮子li
2020-06-29 09:08:18 +08:00
parent 2e95557840 794d6f17db
commit f0bee6af63
8 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi/src/main/resources/META-INF/spring-devtools.properties
+1
View File
@@ -0,0 +1 @@
restart.include.json=/com.alibaba.fastjson.*.jar