From f6c1eff0f11d986bac2ee4f2fa0d293d1db1bb74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sun, 15 Sep 2019 16:20:00 +0800 Subject: [PATCH] =?UTF-8?q?excel=E9=80=9A=E7=94=A8=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 1 + .../java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 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 d88aa4a..2fff6a9 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 @@ -214,6 +214,7 @@ public class CommonEnumUtil { EXCEPTION(2, "异常"), EXCEPTION_DETAIL(3, "异常明细"), EXCEPTION_SOLUTION(4, "解决方案"), + EXCEPTION_ENUM(5, "枚举"), MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮"), diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 6c2a780..67009bb 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -18,9 +18,9 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORGANIZE_YTPE{ - TYPE_GROUP(1,"集团","组织类型为集团"), - TYPE_COMPANY(2,"公司","组织类型为公司"), - TYPE_FACTORY(3,"工厂","组织类型为集团"), + TYPE_GROUP(1,"集团","集团"), + TYPE_COMPANY(2,"公司","公司"), + TYPE_FACTORY(3,"工厂","工厂"), ; private int value; @@ -174,7 +174,7 @@ public class ImppEnumUtil { LOG_LEVEL(int value, String name, String description) { this.value = value; this.name = name; - this.description = description; + this.description = name; } public int getValue() {