Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

lihang

2023-07-10 a3f1b364738a8b8250aaddfba1a8b21a5acb5a26

 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 org.springblade.core.report.datasource.ReportDataSource;
import com.vci.ubcs.core.report.datasource.ReportDataSource;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;