From 663e22ac294acf7a26ab2307b04ddd24700fd88b Mon Sep 17 00:00:00 2001
From: Simple <2424585654@qq.com>
Date: 星期二, 12 十二月 2023 16:58:24 +0800
Subject: [PATCH] fix 修复 excel合并注解会根据第一合并列的结果来决定后续的列合并
---
ruoyi-admin/pom.xml | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index dd4fc58..8193359 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -45,6 +45,12 @@
<dependency>
<groupId>org.dromara</groupId>
+ <artifactId>ruoyi-common-social</artifactId>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-system</artifactId>
</dependency>
@@ -75,20 +81,10 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>me.zhyd.oauth</groupId>
<artifactId>JustAuth</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-auth</artifactId>
- <version>5.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.aliyun</groupId>
- <artifactId>credentials-java</artifactId>
- <version>0.2.4</version>
- <scope>compile</scope>
</dependency>
<!-- skywalking 鏁村悎 logback -->
--
Gitblit v1.9.3