From 0df561aa2c21423f1d4bd78040c4c3507b89e259 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 12 Apr 2021 18:11:59 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/pom.xml | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index aebde2a..dacc6f8 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -371,17 +371,15 @@
<artifactId>mapstruct</artifactId>
<version>1.3.0.Final</version>
</dependency>
-
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-all</artifactId>
- <version>5.3.1</version>
- </dependency>
-
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>5.3.1</version>
</dependency>
</dependencies>
<build>
@@ -396,13 +394,11 @@
<exclude>config/test/*</exclude>
<exclude>config/xcx/*</exclude>
+ <!-- -->
+ <exclude>config/config.json</exclude>
+ <exclude>config/application.properties</exclude>
+ <exclude>config/system.properties</exclude>
- <!--
- <exclude>config/config.json</exclude>
- <exclude>config/application.properties</exclude>
- <exclude>config/system.properties</exclude>
-
- -->
<exclude>**/*.woff</exclude>
@@ -447,6 +443,11 @@
<artifactId>mapstruct-processor</artifactId>
<version>1.3.0.Final</version>
</path>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.12</version>
+ </path>
</annotationProcessorPaths>
</configuration>
</plugin>
--
Gitblit v1.9.1