feat:merchant

service/src/main/java/com/jiejing/fitness/finance/service/utils/JsonUtil.java

 package com.jiejing.fitness.finance.service.utils;
 package com.jiejing.fitness.finance.service.utils;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
+import com.google.common.collect.Lists;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -14,6 +15,9 @@ public class JsonUtil {
   }
   }
 
 
   public static <T> List<T> convertList(Object source, Class<T> clazz) {
   public static <T> List<T> convertList(Object source, Class<T> clazz) {
+    if (null == source) {
+      return Lists.newArrayList();
+    }
     return JSON.parseArray(JSON.toJSONString(source), clazz);
     return JSON.parseArray(JSON.toJSONString(source), clazz);
   }
   }