From 56bd405d8d08754a925bf8b96d5a85f801699437 Mon Sep 17 00:00:00 2001
From: duwenyuan <15600000461@163.com>
Date: Thu, 15 May 2025 10:53:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E7=9B=91=E6=8E=A7=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=92=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0=E9=82=AE=E7=AE=B1=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=99=A8=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?emailServerType=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/jeecg/modules/base/dto/EmailDto.java      | 2 ++
 .../main/java/org/jeecg/modules/mapper/xml/SysEmailMapper.xml   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/EmailDto.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/EmailDto.java
index 6f33a880..cba46849 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/EmailDto.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/EmailDto.java
@@ -36,4 +36,6 @@ public class EmailDto implements Serializable {
     private String username; // 邮箱用户名
 
     private Integer isQiye; // 是否企业邮箱
+
+    private Integer emailServerType;
 }
diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/SysEmailMapper.xml b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/SysEmailMapper.xml
index 7f38f1bf..4a71fa91 100644
--- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/SysEmailMapper.xml
+++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/SysEmailMapper.xml
@@ -36,6 +36,7 @@
             e.is_qiye,
             e.enabled,
             e.email_server_address,
+            e.email_server_type,
             COUNT (l.id) AS alarms
         FROM
             sys_email e