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-modules/ruoyi-demo/pom.xml | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-demo/pom.xml b/ruoyi-modules/ruoyi-demo/pom.xml
index 09bf0bf..119fe61 100644
--- a/ruoyi-modules/ruoyi-demo/pom.xml
+++ b/ruoyi-modules/ruoyi-demo/pom.xml
@@ -65,6 +65,11 @@
<dependency>
<groupId>org.dromara</groupId>
+ <artifactId>ruoyi-common-security</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-common-web</artifactId>
</dependency>
@@ -97,16 +102,6 @@
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-websocket</artifactId>
</dependency>
- <!-- 鐭俊 鐢ㄥ摢涓鍏ュ摢涓緷璧� -->
-<!-- <dependency>-->
-<!-- <groupId>com.aliyun</groupId>-->
-<!-- <artifactId>dysmsapi20170525</artifactId>-->
-<!-- </dependency>-->
-
-<!-- <dependency>-->
-<!-- <groupId>com.tencentcloudapi</groupId>-->
-<!-- <artifactId>tencentcloud-sdk-java-sms</artifactId>-->
-<!-- </dependency>-->
</dependencies>
--
Gitblit v1.9.3