From 50199492d4033f995223c94fdb65297bb13c4505 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 22 Feb 2022 16:49:35 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/pom.xml | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index 661933d..ae1ed8a 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -48,9 +48,9 @@
</properties>
</profile>
<profile>
- <id>mdPrd</id>
+ <id>mdprd</id>
<properties>
- <env>mdPrd</env>
+ <env>mdprd</env>
</properties>
</profile>
<profile>
@@ -393,6 +393,11 @@
<artifactId>hutool-all</artifactId>
<version>5.3.1</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>26.0-jre</version>
+ </dependency>
</dependencies>
<build>
<resources>
@@ -403,17 +408,15 @@
<exclude>config/dev/*</exclude>
<exclude>config/prd/*</exclude>
- <exclude>config/mdPrd/*</exclude>
+ <exclude>config/mdprd/*</exclude>
<exclude>config/test/*</exclude>
<exclude>config/xcx/*</exclude>
<exclude>config/xcshop/*</exclude>
- <!--
+ <!-- -->
<exclude>config/config.json</exclude>
<exclude>config/application.properties</exclude>
<exclude>config/system.properties</exclude>
- -->
-
<exclude>**/*.woff</exclude>
<exclude>**/*.woff2</exclude>
@@ -428,6 +431,7 @@
<include>**/*.woff2</include>
<include>**/*.ttf</include>
<include>**/*.xls</include>
+ <include>**/*.xml</include>
</includes>
</resource>
<resource>
--
Gitblit v1.9.1