From 0b4861205adec36924244d7dbbcfcf048c620d90 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 14 Dec 2020 21:45:51 +0800
Subject: [PATCH] Merge branch 'master' into test
---
zq-erp/pom.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index d990fc5..1898a84 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,12 @@
<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 +374,7 @@
<include>**/*.woff</include>
<include>**/*.woff2</include>
<include>**/*.ttf</include>
+ <include>**/*.xls</include>
</includes>
</resource>
<resource>
--
Gitblit v1.9.1