From fb743ebafca6bbe7ec2b7b0015bace98df60274d Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Thu, 18 Jul 2019 14:52:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=9A=E8=AF=9D=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87ID=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E8=A1=A8?=
 =?UTF-8?q?=E5=94=AF=E4=B8=80=E6=95=99=E7=A0=94=20=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E8=A1=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=98=A0=E5=B0=84?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java     | 1 +
 .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
index b790007..97d6198 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
@@ -1168,6 +1168,7 @@ public class BlockFormEnumUtil {
         LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
         DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
         FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
+        BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null),
         BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null),
         BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null);
 //        DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,null);
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java
index c2ad1d4..f86330b 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java
@@ -24,6 +24,9 @@ public class SessionUser implements Serializable {
     @ApiParam("用户ID")
     private Long userId;
 
+    @ApiParam("设备ID")
+    private String deviceId;
+
     @ApiParam("用户工号")
     private String userCode;