Merge branch 'dev-hongbao'

admin

2019-01-08 c84d8ecd97d111b01db9cfd807300d0491a95bc8

 fanli/src/main/java/com/yeshi/fanli/controller/admin/customerservice/CustomerServiceCommonQuestionAdminController.java

@@ -6,21 +6,17 @@
import java.util.List;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;



import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

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

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

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

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.customerservice.CustomerServiceCommonQuestion;

import com.yeshi.fanli.exception.CustomerServiceCommonQuestionException;