Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2020-01-08 b1d0eae0b98ca29089b30ab62e2c34606a6b304a

 utils/src/main/java/org/yeshi/utils/JsonUtil.java

@@ -12,9 +12,6 @@
import java.util.Map;

import java.util.Set;



import com.fasterxml.jackson.core.JsonProcessingException;

import com.fasterxml.jackson.databind.JavaType;

import com.fasterxml.jackson.databind.ObjectMapper;

import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.google.gson.JsonElement;

@@ -202,7 +199,8 @@
                  desc = (nowDay - oldDay) + "天前";

               }

               out.value(desc);

            }

            } else

               out.value("");

         }



         @Override