From f70951d374cc7859c00edbf2685127ae3934529c Mon Sep 17 00:00:00 2001
From: zendwang <wangzhenxian@idadt.com>
Date: 星期一, 05 十二月 2022 17:59:58 +0800
Subject: [PATCH] update 单元格合并判断cellValue是否相等方法调整
---
ruoyi-admin/pom.xml | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 5ae14c2..a588f62 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
- <version>4.3.0-beta2</version>
+ <version>4.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -26,8 +26,8 @@
<!-- Mysql椹卞姩鍖� -->
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
</dependency>
<!-- Oracle -->
<dependency>
@@ -78,6 +78,24 @@
<artifactId>ruoyi-demo</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- skywalking 鏁村悎 logback -->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.skywalking</groupId>-->
+<!-- <artifactId>apm-toolkit-logback-1.x</artifactId>-->
+<!-- <version>${涓庝綘鐨刟gent鎺㈤拡鐗堟湰淇濇寔涓�鑷磢</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.skywalking</groupId>-->
+<!-- <artifactId>apm-toolkit-trace</artifactId>-->
+<!-- <version>${涓庝綘鐨刟gent鎺㈤拡鐗堟湰淇濇寔涓�鑷磢</version>-->
+<!-- </dependency>-->
+
</dependencies>
<build>
--
Gitblit v1.9.3