From 69346da06d02dafa9138c84036845b94e3628bc4 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Wed, 15 Apr 2020 23:00:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2Bug=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java  | 9 +++++++++
 .../cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java    | 1 +
 .../cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java   | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java
index f0f7fb2..b372f78 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java
@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -35,6 +36,14 @@ public class SysConfig extends BaseBean {
     @ApiParam(value ="名称")
     private String name;
 
+    @Column(name="SOFT_TYPE")
+    @ApiParam(value ="产品类型")
+    private Integer softType;
+
+    public String getSoftTypeTxt() {
+        return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
+    }
+
     @Column(name="CONFIG_TYPE")
     @ApiParam(value ="参数类型ID（枚举：1.系统配置...）" , example ="-1")
     private Integer configType;
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java
index 8bebcfa..d5d8333 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java
@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value="系统异常表",description = "记录系统出现的异常")
 public class SysLogConsole extends BaseBean {
 
+
     /******** 服务器信息 ********/
     @Column(name="SOFT_TYPE")
     @ApiParam(value ="产品名称")
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java
index 5268d83..fedc271 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java
@@ -43,7 +43,7 @@ public class SysLogTaskTime extends BaseBean {
 
     @Column(name="SCHEDULER_SERVER_PORT")
     @ApiParam(value ="调度服务器端口")
-    private String schedulerServerPort;
+    private Integer schedulerServerPort;
 
     @Column(name="TASK_THREAD_ID")
     @ApiParam(value ="任务线程id")