From e74f0abf671df81c5b4fa32cdb8cb3ff69efef65 Mon Sep 17 00:00:00 2001
From: ChengJie1053 <18033291053@163.com>
Date: Thu, 25 Jan 2024 14:17:03 +0800
Subject: [PATCH] Merge the latest code and resolve conflicts

---
 pom.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9335e2ae19..f4df69af77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -219,17 +219,12 @@
     <h2.version>2.2.220</h2.version>
 
     <!-- spring -->
-    <spring-framework.version>5.2.23.RELEASE</spring-framework.version>
-    <spring-security.version>5.7.5</spring-security.version>
-    <spring.boot.version>2.3.12.RELEASE</spring.boot.version>
-    <spring-netflix.version>2.2.9.RELEASE</spring-netflix.version>
-    <spring-cloud.version>Hoxton.SR12</spring-cloud.version>
-    <spring.cloud.nacos.version>2.2.9.RELEASE</spring.cloud.nacos.version>
     <spring-framework.version>5.3.27</spring-framework.version>
     <spring-security.version>5.7.8</spring-security.version>
     <spring.boot.version>2.7.11</spring.boot.version>
     <spring-netflix.version>3.1.7</spring-netflix.version>
     <spring-cloud.version>2021.0.8</spring-cloud.version>
+    <spring.cloud.nacos.version>2.2.9.RELEASE</spring.cloud.nacos.version>
 
     <!-- platform encoding override -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>