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 | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index c792d02..8193359 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -4,9 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<version>${revision}</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -40,29 +39,35 @@
</dependency>
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-common-doc</artifactId>
</dependency>
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
+ <artifactId>ruoyi-common-social</artifactId>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-system</artifactId>
</dependency>
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-job</artifactId>
</dependency>
<!-- 浠ｇ爜鐢熸垚-->
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-generator</artifactId>
</dependency>
<!-- demo妯″潡 -->
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-demo</artifactId>
</dependency>
@@ -77,6 +82,11 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>me.zhyd.oauth</groupId>
+ <artifactId>JustAuth</artifactId>
+ </dependency>
+
<!-- skywalking 鏁村悎 logback -->
<!-- <dependency>-->
<!-- <groupId>org.apache.skywalking</groupId>-->
--
Gitblit v1.9.3