From e26dadca0140ea9c2ed3a140b5689aea495756d9 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 7 Nov 2019 17:30:24 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1162?= =?UTF-8?q?=EF=BC=8Cpcn=E7=99=BB=E9=99=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java | 9 --------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index c95c425..4ab5bdd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2712,7 +2712,8 @@ public class MesEnumUtil { PCN_PUSH(70, "PCN_PUSH"), FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"), REWORK_REPAIR(90, "REWORK_REPAIR"), - PCN_LOGIN(100, "PCN_LOGIN"); + PCN_LOGIN(100, "PCN_LOGIN"), + PCN_MENU(110, "PCN_MENU"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java index f1e5193..e2dbc11 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java @@ -46,15 +46,6 @@ public class MesPcnSysUserOffline extends BaseBean { @ApiParam(value = "登陆名称", access = "登陆名称") private String loginName; - @Column(name = "ORGANIZE_ID") - @ApiParam(value = "部门ID", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long organizeId; - - @Column(name = "ORGANIZE_NAME") - @ApiParam(value = "部门名称", access = "部门名称") - private String organizeName; - @Column(name="USER_TYPE") @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") private Integer userType;