Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -2711,7 +2711,8 @@ public class MesEnumUtil {
         PCN_PULL(60, "PCN_PULL"),
         PCN_PUSH(70, "PCN_PUSH"),
         FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"),
-        REWORK_REPAIR(90, "REWORK_REPAIR");
+        REWORK_REPAIR(90, "REWORK_REPAIR"),
+        PCN_LOGIN(100, "PCN_LOGIN");
 
         private int value;
         private String description;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java

@@ -58,4 +58,8 @@ public class MesPcnSysUserOffline extends BaseBean {
     @ApiParam(value = "部门名称", access = "部门名称")
     private String organizeName;
 
+    @Column(name="USER_TYPE")
+    @ApiParam(value ="账号类型（枚举，待定）" , example ="-1")
+    private Integer userType;
+
 }