From 296392b094a3531cd80bb7974914f494751b2e16 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 14 十二月 2023 16:07:30 +0800
Subject: [PATCH] !458 fix 修复 excel合并注解会根据第一合并列的结果来决定后续的列合并 Merge pull request !458 from simple/excel
---
ruoyi-common/ruoyi-common-mybatis/pom.xml | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-mybatis/pom.xml b/ruoyi-common/ruoyi-common-mybatis/pom.xml
index 67e381f..51199b4 100644
--- a/ruoyi-common/ruoyi-common-mybatis/pom.xml
+++ b/ruoyi-common/ruoyi-common-mybatis/pom.xml
@@ -3,10 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-common</artifactId>
<version>${revision}</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -18,19 +17,19 @@
<dependencies>
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-common-core</artifactId>
</dependency>
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-common-satoken</artifactId>
</dependency>
<!-- dynamic-datasource 澶氭暟鎹簮-->
<dependency>
<groupId>com.baomidou</groupId>
- <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+ <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
</dependency>
<dependency>
--
Gitblit v1.9.3