Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop

# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml
This commit is contained in:
YunaiV
2023-12-30 20:11:07 +08:00
32 changed files with 138 additions and 60 deletions

View File

@@ -264,9 +264,9 @@ yudao:
debug: false
# 积木报表配置
minidao :
base-package: org.jeecg.modules.jmreport.desreport.dao*
db-type: mysql
jeecg:
jmreport:
saas-mode: tenant
# UReport 配置
ureport: