From ad67318f2745563a8363e3f03b138c1c2eef3894 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 30 Nov 2018 00:00:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B8=B8=E9=87=8F=20?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20=E8=B4=A6=E5=8F=B7=E7=8A=B6=E6=80=81=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 241a767..08eac72 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 @@ -256,14 +256,14 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum USER_STATUS { - NORMAL(1, "正常", "正常_NORMAL"), - FREEZE(2, "冻结", "冻结_FREEZE"), +// NORMAL(1, "fa fa-success cell-fa fa-check", "正常"), +// FREEZE(2, "冻结", "冻结_FREEZE"), // ABERRANT(3, "异常", "异常_ABERRANT"), // RESIGNATION(4, "离职", "离职_RESIGNATION"), // EXPIRE(5, "服务到期", "服务到期_EXPIRE"), - LOCKING(6, "锁定", "fa cell-fa fa-lock"), - ENABLE(7, "启用", "fa fa-success cell-fa fa-check"), - DISABLE(8, "禁止", "fa fa-disabled cell-fa fa-times-circle"); +// LOCKING(3, "fa cell-fa fa-lock", "锁定"), + ENABLE(1, "fa fa-success cell-fa fa-check", "启用"), + DISABLE(2, "fa fa-disabled cell-fa fa-times-circle", "禁止"); private int value; private String code; @@ -419,7 +419,7 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum METHOD_LEVEL { - MODULE(1, "模块"), METHOD(2, "功能"), BUTTON(3, "按钮"); + PLUGIN(1, "插件"),MODULE(2, "模块"), METHOD(3, "功能"), BUTTON(4, "按钮"); private int value; private String description;