From 56eba9cded865648465bc2c5815d47441e0457b1 Mon Sep 17 00:00:00 2001
From: sxq <812980466@qq.com>
Date: 星期二, 22 六月 2021 15:35:52 +0800
Subject: [PATCH] Merge branch 'dev' of D:\idea\RuoYi-Vue-Plus with conflicts.
---
ruoyi-demo/pom.xml | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml
index 9789455..4904924 100644
--- a/ruoyi-demo/pom.xml
+++ b/ruoyi-demo/pom.xml
@@ -23,11 +23,6 @@
<artifactId>ruoyi-common</artifactId>
</dependency>
- <dependency>
- <groupId>com.github.xiaoymin</groupId>
- <artifactId>knife4j-spring-boot-starter</artifactId>
- </dependency>
-
</dependencies>
</project>
\ No newline at end of file
--
Gitblit v1.9.3