From 772229b983a7cabc44dc1988daa240876c20b8ec Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Mon, 10 Aug 2020 22:54:28 +0800
Subject: [PATCH] andon

---
 .../i3plus/pojo/andon/model/AndonUserModel.java    | 35 ++++++++++++++++++++++
 .../i3plus/pojo/mes/model/NotifyUserModel.java     | 16 ----------
 2 files changed, 35 insertions(+), 16 deletions(-)
 create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java

diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java
new file mode 100644
index 0000000..846bc5d
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java
@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+
+/**
+ * @Description : 人员model
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2018-10-11 11:02
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("用户信息model")
+public class AndonUserModel extends BaseBean {
+
+    @ApiParam(value ="部门名称")
+    private String departmentNameRdd;
+
+    @ApiParam(value ="用户名称" , access ="账号名称")
+    private String userName;
+
+    @Column(name="USER_LOGIN_NAME")
+    @ApiParam(value ="员工编号")
+    private String userEmpNo;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java
index 9a5b3a8..dc8fe48 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java
@@ -1,22 +1,11 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import java.util.List;
 
 /**
  * @Description : 设备任务通知人员model
@@ -34,23 +23,18 @@ public class NotifyUserModel extends BaseBean {
     @ApiParam(value ="账户ID")
     private Long userInfoId;
 
-    @Column(name="USER_NAME_RDD")
     @ApiParam(value ="用户名称" , access ="账号名称")
     private String userName;
 
-    @Column(name="USER_LOGIN_NAME")
     @ApiParam(value ="登陆名称" , access ="登陆名称")
     private String userLoginName;
 
-    @Column(name="USER_EMAIL")
     @ApiParam(value ="邮箱" , access ="邮箱")
     private String userEmail;
 
-    @Column(name="USER_PHONE")
     @ApiParam(value ="手机号" , access ="手机号")
     private String userPhone;
 
-    @Column(name="USER_STATUS")
     @ApiParam(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1")
     private Integer userStatus;