From 1f1a9c39fc2c04e987eeabd14b65fcc060b36f4e Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Fri, 23 Aug 2019 20:11:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java    | 7 +++++--
 .../main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 3 ++-
 .../java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java  | 3 +++
 3 files changed, 10 insertions(+), 3 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 2328a81..a549eee 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
@@ -209,8 +209,11 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SYS_LOCALE_RESOURCE_TYPE {
-        COMMON(1, "通用"),EXCEPTION(2, "异常"),
-        MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮"),
+        COMMON(1, "通用"),
+        EXCEPTION(2, "异常"),
+        MODULE(10, "模块"),
+        METHOD(11, "功能"),
+        BUTTON(12, "按钮"),
         WEB(13, "前端");
 
         private int value;
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 82b0e3c..6c2a780 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
@@ -1022,7 +1022,8 @@ public class ImppEnumUtil {
         PASSWORD(2, "密码安全策略"),
         MAIL(3, "邮件配置"),
         CONTACT(4, "联系人"),
-        BASIS(5, "基础");
+        BASIS(5, "基础"),
+        CONFIG(6, "系统配置");
 
         private int value;
         private String description;
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java
index dbfbd1a..457f603 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java
@@ -43,7 +43,10 @@ public class SysLabelTemplate extends BaseBean {
     private String templateContent;
 
     // 参数拼接，多参数都好分隔，后台在做处理
+    @Transient
     @ApiParam(value ="模板参数拼接")
+    private String paramsPack;
+
     @Transient
     private String paramsPack;
 

From cf026d6dee5a8cc5bd364111b3465ed391a42e83 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Mon, 26 Aug 2019 11:12:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=88=97=E8=A1=A8=E5=8A=9F=E8=83=BD=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java
index 457f603..63e0250 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java
@@ -48,9 +48,6 @@ public class SysLabelTemplate extends BaseBean {
     private String paramsPack;
 
     @Transient
-    private String paramsPack;
-
-    @Transient
     @ApiParam(value ="模板id对应的模板参数")
     private List<SysLabelTemplateParam> labelTemplateParamList;
 }