From 55ce0e34c9183aebe802b91dba88cd54c6eaa48b Mon Sep 17 00:00:00 2001 From: 司猫子 <songshuang@qq.com> Date: 星期日, 04 二月 2024 09:52:19 +0800 Subject: [PATCH] !480 优化单元格合并后多余内容的清除 * excel插件 优化合并策略 在合适的生命周期完成合并 去除被合并单元格的非首行内容 --- ruoyi-common/ruoyi-common-bom/pom.xml | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml index 8a9e25a..4a2dc1c 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-bom/pom.xml @@ -14,7 +14,7 @@ </description> <properties> - <revision>5.1.0-SNAPSHOT</revision> + <revision>5.2.0-SNAPSHOT</revision> </properties> <dependencyManagement> @@ -117,6 +117,12 @@ <version>${revision}</version> </dependency> + <dependency> + <groupId>org.dromara</groupId> + <artifactId>ruoyi-common-social</artifactId> + <version>${revision}</version> + </dependency> + <!-- web鏈嶅姟 --> <dependency> <groupId>org.dromara</groupId> @@ -165,6 +171,7 @@ <artifactId>ruoyi-common-websocket</artifactId> <version>${revision}</version> </dependency> + </dependencies> </dependencyManagement> -- Gitblit v1.9.3