zgty/zt-dsc
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test'

Browse Source 
# Conflicts:
#	pom.xml
#	sql/dm/ruoyi-vue-pro-dm8.sql
#	sql/tools/convertor.py
#	yudao-framework/yudao-spring-boot-starter-biz-business/src/main/java/cn/iocoder/yudao/framework/business/core/db/BusinessBaseDO.java
#	yudao-module-crm/yudao-module-crm-server/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml
#	yudao-module-iot/yudao-module-iot-biz/src/main/resources/application-dev.yaml
#	yudao-module-member/yudao-module-member-server/src/main/resources/application-dev.yaml
This commit is contained in:
chenbowen
2025-07-03 11:47:57 +08:00
parent aa32db5c11 6575e92757
commit bde95cdfa4
18 changed files with 2709 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-system/yudao-module-system-server/src/main/resources/application-dev.yaml
View File

@@ -93,7 +93,7 @@ spring:
xxl:
job:
admin:
addresses: http://127.0.0.1:9090/xxl-job-admin # 调度中心部署跟地址
addresses: http://xxl-job-admin:8080/xxl-job-admin # 调度中心部署跟地址
--- #################### 服务保障相关配置 ####################