From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 18 十二月 2018 11:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/customerservice/CustomerServiceCommonQuestionAdminController.java |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/customerservice/CustomerServiceCommonQuestionAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/customerservice/CustomerServiceCommonQuestionAdminController.java
index 2d321d5..69a2b7f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/customerservice/CustomerServiceCommonQuestionAdminController.java
+++ b/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;

--
Gitblit v1.8.0