Merge dev_New_pro into dev_山西_晋和园_pro

gongchunyi

2026-05-28 10b88a7ff17caf92f3d4e8a550c1085a70c2517a

 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;

//

///**