From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua

---
 pom.xml |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6988c77..a34ca37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,7 +254,7 @@
 			<artifactId>jasypt-spring-boot-starter</artifactId>
 			<version>2.0.0</version>
 		</dependency>
-		
+
 		<!-- 鑾峰彇绯荤粺淇℃伅 -->
 		<dependency>
 			<groupId>com.github.oshi</groupId>
@@ -360,7 +360,6 @@
             <version>13.0</version>
             <scope>compile</scope>
         </dependency>
-
 		<dependency>
 			<groupId>com.ots</groupId>
 			<artifactId>tai-ots-framework</artifactId>
@@ -369,7 +368,7 @@
 			<systemPath>${project.basedir}/jar/tai-ots-framework.jar</systemPath>
 		</dependency>
 
-    </dependencies>
+	</dependencies>
 
 <!--	<build>-->
 <!--		<finalName>${project.artifactId}</finalName>-->

--
Gitblit v1.9.1