From dbd7fd484b5c7ed00cb895f227645848c3677c08 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 11:21:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/framework/config/ScheduleConfig.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java b/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java
index 576d2c9..4dfb27a 100644
--- a/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java
+++ b/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;
 //
 ///**

--
Gitblit v1.9.3