Merge remote-tracking branch 'origin/master'

wangting

2023-07-12 a3d588a997397578a4a241f694156ead3eb15bb9

 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;