Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-21 299e3b3ae10786a5b00124333a3e732009f83295

 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;