From 0b36cae1d52077376b6bf99fcf8ba0fed8081bdc Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 01 十二月 2020 17:52:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 pom.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8be307c..97e0a98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -464,6 +464,12 @@
         <profile.active>shgjs</profile.active>
       </properties>
     </profile>
+    <profile>
+      <id>zkyshs</id>
+      <properties>
+        <profile.active>zkyshs</profile.active>
+      </properties>
+    </profile>
   </profiles>
   <build>
     <finalName>smartlab</finalName>

--
Gitblit v1.9.2