From 507c3590676a06bce2fbbd4fe4b867191b8678ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= <yunhao.wang@estsh.com>
Date: Mon, 27 May 2019 15:28:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=AD=97=E5=85=B8=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20websocket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java  | 3 +++
 .../java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java    | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java
index 6581078..d5ffa91 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java
@@ -13,6 +13,9 @@ import lombok.Data;
 @Data
 public class MailConfig {
 
+    @ApiParam(value = "邮箱开关")
+    private int mailSwitch;
+
     @ApiParam(value = "邮箱服务器")
     private String mailHost;
 
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java
index 75819f7..5361cd0 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java
@@ -50,6 +50,14 @@ public class SysDictionary extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long parentId;
 
+    public long getParentIdVal(){
+        if(parentId == null){
+            return 0;
+        } else {
+            return parentId.longValue();
+        }
+    }
+
     @Column(name="PARENT_NAME_RDD")
     @ApiParam(value ="父级节点名称")
     private String parentNameRdd;