From ea5cbe91b94e48e9f63947d01decdf919848ae91 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 11 六月 2021 17:35:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 pom.xml |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/pom.xml b/pom.xml
index c3ba94f..9786c9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -368,7 +368,11 @@
       <artifactId>mail</artifactId>
       <version>1.4.1</version>
     </dependency>
-
+    <dependency >
+      <groupId >com.sun.mail </groupId >
+      <artifactId >javax.mail </artifactId >
+      <version >1.6.0 </version >
+    </dependency >
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi</artifactId>
@@ -470,6 +474,12 @@
         <profile.active>zkyshs</profile.active>
       </properties>
     </profile>
+    <profile>
+      <id>gslab</id>
+      <properties>
+        <profile.active>gslab</profile.active>
+      </properties>
+    </profile>
   </profiles>
   <build>
     <finalName>smartlab</finalName>

--
Gitblit v1.9.2