Merge remote-tracking branch 'origin/div' into div

admin

2019-08-05 35c25585cf6fea9e29574a75a03c57381cbe19e1

 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;