Merge remote-tracking branch 'origin/div' into div

admin

2020-03-14 55b3bd7821f14db9e9441d8b34fb9bdc1a9e4df7

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CustomerServiceController.java

@@ -12,9 +12,7 @@
import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.springframework.web.bind.annotation.RequestParam;

import org.springframework.web.multipart.MultipartFile;

import org.springframework.web.multipart.commons.CommonsMultipartFile;

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;