From f8579cdfc62c10436fe92c0eb43c8668b75714cf Mon Sep 17 00:00:00 2001
From: "yunhao.wang" <yunhao.wang@estsh.com>
Date: Tue, 13 Nov 2018 20:27:12 +0800
Subject: [PATCH] Merge branch 'master' of
 http://git.estsh.com/i3-IMPP/i3plus-core
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Conflicts:
#	modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java
#	modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java

语言管理 完成
资源管理 完成
---
 .../cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java     |  1 +
 .../cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java  | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

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 30cb2cf..5a04284 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
@@ -150,6 +150,7 @@ public class CommonEnumUtil {
     /**
      * 处理标识
      */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SYS_LOCALE_RESOURCE_TYPE {
         COMMON(1, "通用"),EXCEPTION(2, "异常"),
         MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮");
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java
index c739e77..f5a576f 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java
@@ -33,13 +33,21 @@ public class SysLocaleResource  extends BaseBean {
 
     private transient String resourceTypeTxt;
     public String getResourceTypeTxt(){
-        return CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.valueOf(this.resourceType);
+        if(this.resourceType != null){
+            return CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.valueOf(this.resourceType);
+        } else {
+            return null;
+        }
     }
 
     @Column(name="language_code")
     @ApiParam(value = "语言编码",example = "浏览器语言编码")
     private String languageCode;
 
+    @Column(name="language_name_rdd")
+    @ApiParam(value = "语言名称",example = "浏览器语言名称")
+    private String languageNameRdd;
+
     @Column(name="resource_key")
     @ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档")
     private String resourceKey;