Merge remote-tracking branch 'remotes/origin/dev' into test

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, "按钮"),

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() {