From 9342bbef5659a43114193a725a96ad852eec7a79 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 17 九月 2021 23:39:27 +0800
Subject: [PATCH] fix 修复合并错误
---
ruoyi-framework/pom.xml | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index 236eb05..0a147a8 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -64,15 +64,9 @@
<!-- 绯荤粺妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-system</artifactId>
+ <artifactId>ruoyi-common</artifactId>
</dependency>
- <!-- jdk11 缂哄け渚濊禆 jaxb-->
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb.version}</version>
- </dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
--
Gitblit v1.9.3