From 36d3d9da36c71e65081e38cf9cfbd5e0ff6bfeed Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 14 七月 2023 21:15:42 +0800 Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs --- Source/UBCS/ubcs-ops/ubcs-report/src/main/java/com/vci/ubcs/report/config/BladeReportConfiguration.java | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/UBCS/ubcs-ops/ubcs-report/src/main/java/com/vci/ubcs/report/config/BladeReportConfiguration.java b/Source/UBCS/ubcs-ops/ubcs-report/src/main/java/com/vci/ubcs/report/config/BladeReportConfiguration.java index cd043c2..1d08ec8 100644 --- a/Source/UBCS/ubcs-ops/ubcs-report/src/main/java/com/vci/ubcs/report/config/BladeReportConfiguration.java +++ b/Source/UBCS/ubcs-ops/ubcs-report/src/main/java/com/vci/ubcs/report/config/BladeReportConfiguration.java @@ -16,7 +16,7 @@ */ package com.vci.ubcs.report.config; -import com.vci.ubcs.core.report.datasource.ReportDataSource; +//import org.springblade.core.report.datasource.ReportDataSource; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -32,12 +32,12 @@ @ConditionalOnProperty(value = "report.enabled", havingValue = "true", matchIfMissing = true) public class BladeReportConfiguration { - /** - * 鑷畾涔夋姤琛ㄥ彲閫夋暟鎹簮 - */ - @Bean - public ReportDataSource reportDataSource(DataSource dataSource) { - return new ReportDataSource(dataSource); - } +// /** +// * 鑷畾涔夋姤琛ㄥ彲閫夋暟鎹簮 +// */ +// @Bean +// public ReportDataSource reportDataSource(DataSource dataSource) { +// return new ReportDataSource(dataSource); +// } } -- Gitblit v1.9.3