From 1011d9d0aaab0e978caf4513b64f0a369bcd9a96 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 22 七月 2019 15:39:56 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxGoodsClassController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxGoodsClassController.java b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxGoodsClassController.java
index 30daf2c..4a33958 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxGoodsClassController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxGoodsClassController.java
@@ -12,7 +12,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.yeshi.utils.JsonUtil;
 
-import com.yeshi.fanli.controller.client.SearchController;
+import com.yeshi.fanli.controller.client.v1.SearchController;
 import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
 import com.yeshi.fanli.entity.bus.clazz.GoodsSecondClass;

--
Gitblit v1.8.0