From 1ea73a67ca086251de921642c10b328e7631144a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 03 十一月 2021 13:58:45 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-admin/pom.xml | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 12327e3..9ec68cd 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -41,10 +41,15 @@
<artifactId>ruoyi-system</artifactId>
</dependency>
- <!-- 瀹氭椂浠诲姟-->
+ <!-- 瀹氭椂浠诲姟 @deprecated 3.4.0鍒犻櫎 杩佺Щ鑷硏xl-job -->
+<!-- <dependency>-->
+<!-- <groupId>com.ruoyi</groupId>-->
+<!-- <artifactId>ruoyi-quartz</artifactId>-->
+<!-- </dependency>-->
+
<dependency>
<groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-quartz</artifactId>
+ <artifactId>ruoyi-job</artifactId>
</dependency>
<dependency>
@@ -115,4 +120,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
--
Gitblit v1.9.3