Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts: # yudao-dependencies/pom.xml # yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/config/UReportConfiguration.java # yudao-server/src/main/resources/application-dev.yaml # yudao-server/src/main/resources/application-local.yaml
This commit is contained in:
@@ -260,9 +260,9 @@ yudao:
|
||||
debug: false
|
||||
|
||||
# 积木报表配置
|
||||
minidao :
|
||||
base-package: org.jeecg.modules.jmreport.desreport.dao*
|
||||
db-type: mysql
|
||||
jeecg:
|
||||
jmreport:
|
||||
saas-mode: tenant
|
||||
|
||||
# UReport 配置
|
||||
ureport:
|
||||
|
Reference in New Issue
Block a user