From 83f9a7b7276dc19258115a2126a584c378e14827 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Fri, 16 Mar 2018 20:56:37 +0800
Subject: [PATCH] merge

---
 boot-service/pom.xml | 8 ++++----
 boot-web/pom.xml     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/boot-service/pom.xml b/boot-service/pom.xml
index 2ef6004..4d85325 100644
--- a/boot-service/pom.xml
+++ b/boot-service/pom.xml
@@ -29,7 +29,7 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
-        <!--数据库-->
+        <!-- 数据库 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -38,7 +38,7 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
-        <!-- lombok:实体类自动生成getting和setting方法,以及equals,hashCode,toString等-->
+        <!-- lombok:实体类自动生成getting和setting方法,以及equals,hashCode,toString等 -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -48,7 +48,7 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
         </dependency>
-        <!-- redis-->
+        <!-- redis -->
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
@@ -81,7 +81,7 @@
             <artifactId>poi-ooxml</artifactId>
             <version>3.14</version>
         </dependency>
-        <!--httpclient -->
+        <!-- httpclient -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
diff --git a/boot-web/pom.xml b/boot-web/pom.xml
index c98f289..2560eca 100644
--- a/boot-web/pom.xml
+++ b/boot-web/pom.xml
@@ -49,7 +49,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- test-->
+        <!-- test -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -61,7 +61,7 @@
             <artifactId>spring-boot-starter-tomcat</artifactId>
             <!--<scope>provided</scope>-->
         </dependency>
-        <!-- aop-->
+        <!-- aop -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>