From e46f1ae9150028b794a9519dda7d66bf77a486c2 Mon Sep 17 00:00:00 2001
From: xu-bin-bin <34916924+xu-bin-bin@users.noreply.github.com>
Date: 星期四, 31 八月 2023 16:51:06 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

---
 pom.xml |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 90c385c..2ecfad3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>com.genersoft</groupId>
 	<artifactId>wvp-pro</artifactId>
-	<version>2.6.8</version>
+	<version>2.6.9</version>
 	<name>web video platform</name>
 	<description>鍥芥爣28181瑙嗛骞冲彴</description>
 	<packaging>${project.packaging}</packaging>
@@ -142,13 +142,23 @@
 			<version>42.5.1</version>
 		</dependency>
 
-
+		<!-- kingbase浜哄ぇ閲戜粨 -->
+		<!-- 鎵嬪姩涓嬭浇椹卞姩鍚庡畨瑁� -->
+		<!-- mvn install:install-file -Dfile=/home/lin/soft/kingbase/jdbc-aarch/kingbase8-8.6.0.jar -DgroupId=com.kingbase -DartifactId=kingbase8 -Dversion=8.6.0 -Dpackaging=jar
+ -->
+		<dependency>
+			<groupId>com.kingbase</groupId>
+			<artifactId>kingbase8</artifactId>
+			<version>8.6.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/libs/jdbc-aarch/kingbase8-8.6.0.jar</systemPath>
+		</dependency>
 
 		<!--Mybatis鍒嗛〉鎻掍欢 -->
 		<dependency>
 			<groupId>com.github.pagehelper</groupId>
 			<artifactId>pagehelper-spring-boot-starter</artifactId>
-			<version>1.4.3</version>
+			<version>1.4.6</version>
 		</dependency>
 
 		<!--鍦ㄧ嚎鏂囨。 -->

--
Gitblit v1.8.0