From c04a59775ee986f33fe19e21ae02cff9f6b002a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 14 四月 2020 11:07:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/customerservice/CustomerServiceCommonQuestionAdminController.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 b2b092d..704a5d7 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
@@ -17,7 +17,7 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import com.yeshi.fanli.entity.customerservice.CustomerServiceCommonQuestion;
-import com.yeshi.fanli.exception.CustomerServiceCommonQuestionException;
+import com.yeshi.fanli.exception.user.CustomerServiceCommonQuestionException;
 import com.yeshi.fanli.service.AdminUserService;
 import com.yeshi.fanli.service.inter.customerservice.CustomerServiceCommonQuestionService;
 import com.yeshi.fanli.tag.PageEntity;

--
Gitblit v1.8.0