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

yujian

2019-09-11 ddb6519f9cfc8a0ce8e2b32af7906a647dfe136e

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java

@@ -42,7 +42,6 @@
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import com.yeshi.fanli.vo.brand.BrandInfoVO;

import com.yeshi.fanli.vo.goods.GoodsDetailVO;

import com.yeshi.fanli.vo.goods.ShopInfoVO;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;