From 42c14093318794167f7df701b0fff84884e468ad Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Wed, 7 Mar 2018 17:33:17 +0800
Subject: [PATCH] merge

---
 boot-service/src/main/java/com/xwbing/util/JsonResult.java    | 4 ++--
 .../java/com/xwbing/util/{JSONUtil.java => JsonUtil.java}     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename boot-service/src/main/java/com/xwbing/util/{JSONUtil.java => JsonUtil.java} (97%)

diff --git a/boot-service/src/main/java/com/xwbing/util/JsonResult.java b/boot-service/src/main/java/com/xwbing/util/JsonResult.java
index b715e27..467c325 100644
--- a/boot-service/src/main/java/com/xwbing/util/JsonResult.java
+++ b/boot-service/src/main/java/com/xwbing/util/JsonResult.java
@@ -41,7 +41,7 @@ public class JsonResult {
         if (StringUtils.isNotEmpty(message)) {
             jsonObjResult.setMessage(message);
         }
-        jsonObjResult.setData(JSONUtil.beanToMap(o));
+        jsonObjResult.setData(JsonUtil.beanToMap(o));
         return JSON.parseObject(JSON.toJSONString(jsonObjResult, SerializerFeature.WriteMapNullValue));
     }
 
@@ -54,7 +54,7 @@ public class JsonResult {
         JsonResult jsonObjResult = new JsonResult();
         jsonObjResult.setSuccess(rest.isSuccess());
         jsonObjResult.setMessage(rest.getMessage());
-        jsonObjResult.setData(JSONUtil.beanToMap(rest.getData()));
+        jsonObjResult.setData(JsonUtil.beanToMap(rest.getData()));
         jsonObjResult.setId(rest.getId());
         return JSON.parseObject(JSON.toJSONString(jsonObjResult, SerializerFeature.WriteMapNullValue));
     }
diff --git a/boot-service/src/main/java/com/xwbing/util/JSONUtil.java b/boot-service/src/main/java/com/xwbing/util/JsonUtil.java
similarity index 97%
rename from boot-service/src/main/java/com/xwbing/util/JSONUtil.java
rename to boot-service/src/main/java/com/xwbing/util/JsonUtil.java
index 5047ab6..974cc40 100644
--- a/boot-service/src/main/java/com/xwbing/util/JSONUtil.java
+++ b/boot-service/src/main/java/com/xwbing/util/JsonUtil.java
@@ -16,8 +16,8 @@ import java.util.Map;
  * 说明: json格式转换
  * 作者: xiangwb
  */
-public class JSONUtil {
-    private static final Logger LOGGER = LoggerFactory.getLogger(JSONUtil.class);
+public class JsonUtil {
+    private static final Logger LOGGER = LoggerFactory.getLogger(JsonUtil.class);
 
     /**
      * 实体对象不序列化转换成jsonObject