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

admin

2019-11-05 e021e32a6ff0ec216f69c24f7ea929798bdce4c5

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java

@@ -496,7 +496,7 @@
      List<Integer> cidList = new ArrayList<>();

      cidList.add(1);// 女装

      int sort = getCommonSort(cid);

      result = DaTaoKeApiUtil.search("内衣 女", cidList, null, null, page, pageSize, sort);

      result = DaTaoKeApiUtil.search("", cidList, null, null, page, pageSize, sort);

      List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();

      long count = 0;

      if (result != null) {