From 95cdd1c5f86bf7ec5af17a07d819976a0365b5d7 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 09 Dec 2020 09:54:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0
---
zq-erp/pom.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index d990fc5..9534212 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -53,6 +53,12 @@
<env>xcx</env>
</properties>
</profile>
+ <profile>
+ <id>lhx</id>
+ <properties>
+ <env>lhx</env>
+ </properties>
+ </profile>
</profiles>
<dependencies>
@@ -348,12 +354,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>**/*.woff</exclude>
@@ -368,6 +373,7 @@
<include>**/*.woff</include>
<include>**/*.woff2</include>
<include>**/*.ttf</include>
+ <include>**/*.xls</include>
</includes>
</resource>
<resource>
--
Gitblit v1.9.1