From 1275a97ef9c3f6ff0d152341a2218a4edea0edf6 Mon Sep 17 00:00:00 2001
From: "baoyu.wang" <baoyu.wang@estsh.com>
Date: Thu, 18 Aug 2022 09:49:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E6=9B=B4=E6=94=B9wms?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=AD=90=E6=A3=80=E6=B5=8B=E9=A1=B9=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java
index 8b7d700..7204267 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java
@@ -81,6 +81,6 @@ public class WmsPartItemCheck extends BaseBean {
 
     @Column(name = "INPUT_METHOD")
     @ApiParam("录入方式")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
-    private Integer inputMethod;
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String inputMethod;
 }

From 5e2987c7ea891ed7e3c9de18c6572593085bfe04 Mon Sep 17 00:00:00 2001
From: "feng.liu" <123456>
Date: Thu, 18 Aug 2022 13:31:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=83=BD=E6=BA=90?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
index 7263ba4..8cc1724 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
@@ -102,6 +102,11 @@ public class CommonEnumUtil {
         EAM_PAD(109, 8500, 28, 211000000L, "eam-pad", "设备信息管理服务pad"),
 
         /**
+         * 能源管理系统
+         */
+        EMS(37, 8450, 31, 170000000L, "i3ems", "能源管理系统 "),
+
+        /**
          * SWEB调用
          */
         SWEB_VENDOR(666,8810,0,0,"sweb-vendor","供应商客户端服务");