hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-08-03 12:54:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/user-social

Browse Source 
 Conflicts:
	yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/auth/impl/SysAuthServiceImpl.java
	yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/auth/SysAuthServiceImplTest.java
	yudao-dependencies/pom.xml
	yudao-framework/pom.xml
	yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/system/service/auth/impl/SysAuthServiceImpl.java
This commit is contained in:
YunaiV
2021-12-15 09:26:47 +08:00
parent 91e98a5e62 62ca36dede
commit 712067979c
743 changed files with 63206 additions and 1997 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-user-server/src/main/resources/application-local.yaml
View File

@@ -63,6 +63,11 @@ spring:
--- #################### 定时任务相关配置 ####################
# Quartz 配置项，对应 QuartzProperties 配置类
spring:
quartz:
auto-startup: false # 无需使用 Quartz，交给 yudao-admin-server 环境
--- #################### 配置中心相关配置 ####################
# Apollo 配置中心