From 763616c67dd8cdede200c993b434affb58c37256 Mon Sep 17 00:00:00 2001
From: maxf <1107047387@qq.com>
Date: Fri, 11 Jan 2019 10:03:54 +0800
Subject: [PATCH] =?UTF-8?q?1.3.7=20=E5=9B=9E=E6=BB=9A1.3.6=E8=87=B31.3.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 UPDATE.md                                         | 7 +++++++
 pom.xml                                           | 2 +-
 src/main/java/com/yexuejc/base/util/JsonUtil.java | 6 ++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/UPDATE.md b/UPDATE.md
index 7b52183..dd6c38e 100644
--- a/UPDATE.md
+++ b/UPDATE.md
@@ -1,6 +1,13 @@
 yexuejc-base 更新记录
 ------------------
 
+#### version ：1.3.7
+**time：2019-1-11 10:02:03** <br/>
+**branch：** master    <br/>
+**update：**     <br/>
+>1. 考虑到向下兼容，回滚1.3.6【json增加下划线、驼峰互转】,考虑更优方案（解决加入下个版本）
+#
+
 #### version ：1.3.6
 **time：2019-1-10 14:55:13** <br/>
 **branch：** master    <br/>
diff --git a/pom.xml b/pom.xml
index d0fd9d6..39bbe15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>top.yexuejc</groupId>
     <artifactId>yexuejc-base</artifactId>
-    <version>1.3.6</version>
+    <version>1.3.7</version>
 
     <name>${project.artifactId}</name>
     <url>https://github.com/yexuejc/yexuejc-base</url>
diff --git a/src/main/java/com/yexuejc/base/util/JsonUtil.java b/src/main/java/com/yexuejc/base/util/JsonUtil.java
index b6682af..8165fd8 100644
--- a/src/main/java/com/yexuejc/base/util/JsonUtil.java
+++ b/src/main/java/com/yexuejc/base/util/JsonUtil.java
@@ -12,7 +12,6 @@ import java.io.InputStream;
 import java.util.Map;
 import java.util.logging.Logger;
 
-
 /**
  * json工具类，基于jackson
  *
@@ -48,6 +47,10 @@ public class JsonUtil {
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
         objectMapper.setDateFormat(DateUtil.DATE_TIME_FORMAT);
+    }
+
+    //TODO 待优化
+    public static void initSnakeCase() {
         //驼峰下划线互转
         objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
     }
@@ -109,7 +112,6 @@ public class JsonUtil {
         return pojo;
     }
 
-
     /**
      * Json字符串转换为Java对象
      *