From eacbdbaa7d8a651697516977fb46ac8c3d9d6d12 Mon Sep 17 00:00:00 2001
From: Dominic_Xiao <1003069915@qq.com>
Date: Fri, 2 Apr 2021 20:00:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?20027--MES=E7=9C=8B=E6=9D=BF-=E7=8F=AD?=
 =?UTF-8?q?=E7=BB=84=E6=95=B0=E6=9D=A5=E6=BA=90=E7=8F=AD=E7=BB=84=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E9=9C=80=E8=A6=81=E7=8F=AD=E7=BB=84=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=9D=A5=E7=BB=B4=E6=8A=A4=E7=8F=AD=E7=BB=84=E4=BA=BA?=
 =?UTF-8?q?=E6=95=B0-2021-04-02?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java
index 9715a22..829b908 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java
@@ -50,7 +50,11 @@ public class MesShiftGroup extends BaseBean implements Serializable {
     @ApiParam("班长")
     private String squadLeader;
 
-    @Transient
-    @ApiParam("班组数")
-    private String count;
+    @Column(name = "USER_EMP_NO")
+    @ApiParam(value = "工号")
+    private String userEmpNo;
+
+    @Column(name = "SHIFT_NUM")
+    @ApiParam("班组人数")
+    private String shiftNum;
 }

From 6ffd5862749c26418e5a1cb6f2e1c5f6e913908d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= <jessica.chen@estsh.com>
Date: Tue, 6 Apr 2021 18:04:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=9014903=2019108+=20PCN=E3=80=90?=
 =?UTF-8?q?=E4=B8=8A=E8=A3=85=E5=B7=A5=E4=BD=8D=E3=80=91=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20+2021-04-03=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java  | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index d4d2787..7072531 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -6625,4 +6625,32 @@ public class MesPcnEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum THA_MONITOR_STATUS {
+        MONITORING(10, "MONITORING", "监听中"),
+        MONITOR_COMPLETE(20, "MONITOR_COMPLETE", "监听完成");
+
+        private int value;
+        private String code;
+        private String description;
+
+        THA_MONITOR_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
 }