Merge remote-tracking branch 'origin/dev_New_pro' into dev_山西_晋和园_pro

yuan

2026-05-20 d8cf4b3db03a4a4c2d12ef21eaec78cb7d3b10d1

 src/main/java/com/ruoyi/framework/config/ScheduleConfig.java

@@ -3,7 +3,7 @@
//import org.springframework.context.annotation.Bean;

//import org.springframework.context.annotation.Configuration;

//import org.springframework.scheduling.quartz.SchedulerFactoryBean;

//import javax.sql.DataSource;

//import jakarta.sql.DataSource;

//import java.util.Properties;

//

///**