From 8e029e82e0696e4221c45555e1f7256dde09a0b1 Mon Sep 17 00:00:00 2001
From: "yunhao.wang" <yunhao.wang@estsh.com>
Date: Wed, 6 Mar 2019 20:01:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BC=98=E5=8C=96=20?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=20=E9=82=AE=E4=BB=B6=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/ImppEnumUtil.java    | 34 ++++++++++++++++++++++
 .../estsh/i3plus/pojo/platform/bean/SysConfig.java |  4 +++
 .../i3plus/pojo/platform/bean/SysMessage.java      |  6 +++-
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
index 0d0e9c0..4d003e2 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
@@ -1047,4 +1047,38 @@ public class ImppEnumUtil {
             return tmp;
         }
     }
+
+    //messageReceiverType
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MESSAGE_RECEIVER_TYPE {
+        INTERNAL(1, "内部人员接收"),
+        EXTERNAL(2, "外部人员接收"),
+        URGENT(3, "紧急联系人接收");
+        private int value;
+        private String description;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        private MESSAGE_RECEIVER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }
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 32d44bc..85501de 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
@@ -55,6 +55,10 @@ public class SysConfig extends BaseBean {
     @ApiParam(value ="参数值")
     private String configValue;
 
+    @Column(name="CONFIG_VALUE_OPTION")
+    @ApiParam(value ="参数值选项（参数类型为多选时使用），格式：{key:'',value:''}")
+    private String configValueOption;
+
     @Column(name="CONFIG_DESCRIPTION")
     @ApiParam(value ="参数描述")
     private String configDescription;
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java
index be4d80c..978c2d1 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java
@@ -55,8 +55,12 @@ public class SysMessage extends BaseBean {
     @ApiParam(value ="发送者名称" )
     private String messageSenderNameRdd;
 
+    @Column(name="MESSAGE_RECEIVER_TYPE")
+    @ApiParam(value ="收件人类型(枚举：ImppEnumUtil.MESSAGE_TYPE)" , example ="-1")
+    private Integer messageReceiverType;
+
     @Column(name="MESSAGE_RECEIVERS_ID")
-    @ApiParam(value ="发送者id" )
+    @ApiParam(value ="收件者id" )
     private String messageReceiversId;
 
     @Column(name="MESSAGE_RECEIVERS_NAME_RDD")