Merge remote-tracking branch 'origin/dev' into test

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;
 

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;