Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts: # yudao-dependencies/pom.xml # yudao-module-report/yudao-module-report-biz/pom.xmlpull/126/head
commit
dabb8d7490
|
@ -24,7 +24,6 @@
|
||||||
<artifactId>yudao-spring-boot-starter-env</artifactId>
|
<artifactId>yudao-spring-boot-starter-env</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
<!-- 依赖服务 -->
|
<!-- 依赖服务 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.cloud</groupId>
|
<groupId>cn.iocoder.cloud</groupId>
|
||||||
|
|
|
@ -94,13 +94,6 @@ easy-trans:
|
||||||
|
|
||||||
--- #################### MQ 消息队列相关配置 ####################
|
--- #################### MQ 消息队列相关配置 ####################
|
||||||
|
|
||||||
--- #################### 定时任务相关配置 ####################
|
|
||||||
|
|
||||||
# 积木报表配置
|
|
||||||
jeecg:
|
|
||||||
jmreport:
|
|
||||||
saas-mode: tenant
|
|
||||||
|
|
||||||
--- #################### 芋道相关配置 ####################
|
--- #################### 芋道相关配置 ####################
|
||||||
|
|
||||||
yudao:
|
yudao:
|
||||||
|
|
Loading…
Reference in New Issue