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

---
 .../com/xwbing/configuration/DispatcherServletConfig.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java b/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java
index 234059b..72a6740 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java
+++ b/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java
@@ -116,10 +116,10 @@ public class DispatcherServletConfig extends WebMvcConfigurerAdapter {
         FastJsonConfig fastJsonConfig = new FastJsonConfig();
         fastJsonConfig.setSerializerFeatures(
                 SerializerFeature.PrettyFormat,
-//                SerializerFeature.WriteMapNullValue,//输出所有为null的字段
+                SerializerFeature.WriteMapNullValue,//输出所有为null的字段
 //                SerializerFeature.WriteNullNumberAsZero,//包装类字段如果为null,输出为0,而非null
-                SerializerFeature.WriteNullListAsEmpty,//List字段如果为null,输出为[],而非null
-                SerializerFeature.WriteNullStringAsEmpty);//字符类型字段如果为null,输出为"",而非null
+//                SerializerFeature.WriteNullStringAsEmpty,//字符类型字段如果为null,输出为"",而非null
+                SerializerFeature.WriteNullListAsEmpty);//List字段如果为null,输出为[],而非null
         messageConverter.setFastJsonConfig(fastJsonConfig);
         return messageConverter;
     }