From f34c966b68f73f0335fef19dcb31e4d23860d13a Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期二, 24 十一月 2020 14:57:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
pom.xml | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/pom.xml b/pom.xml
index 986a8fb..c736979 100644
--- a/pom.xml
+++ b/pom.xml
@@ -446,6 +446,24 @@
<profile.active>qhyhs</profile.active>
</properties>
</profile>
+ <profile>
+ <id>szygs</id>
+ <properties>
+ <profile.active>szygs</profile.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>zkysh</id>
+ <properties>
+ <profile.active>zkysh</profile.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>shgjs</id>
+ <properties>
+ <profile.active>shgjs</profile.active>
+ </properties>
+ </profile>
</profiles>
<build>
<finalName>smartlab</finalName>
@@ -479,6 +497,14 @@
<webResources>
<resource>
<directory>src/main/webapp</directory>
+ <excludes>
+ <exclude>
+ resources/template/*
+ </exclude>
+ <exclude>
+ resources/*.docx
+ </exclude>
+ </excludes>
<filtering>true</filtering>
<targetPath>./</targetPath>
</resource>
--
Gitblit v1.9.2