From 779c0046748d718f6f674cc8ad5a4e97493effef Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 16 Mar 2021 23:12:51 +0800
Subject: [PATCH] 合并
---
zq-erp/pom.xml | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index 0646994..f11f7a0 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,11 +394,10 @@
<exclude>config/test/*</exclude>
<exclude>config/xcx/*</exclude>
- <!--
+ <!---->
<exclude>config/config.json</exclude>
<exclude>config/application.properties</exclude>
<exclude>config/system.properties</exclude>
--->
@@ -446,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