Merge branch 'div_8'

yujian

2019-05-14 26b5b1a6bbbb5ff64dc2ec73cf8b11f1aa61c1c5

 fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsClassController.java

@@ -620,8 +620,6 @@
         filter.setPage(page);

         filter.setPageSize(pageSize);

         filter.setCateIds(taoBaoCatIds);

         //测试时添加

         filter.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);//销量从高到低



         JSONObject result = taoKeGoodsService.searchWuLiao(filter);

         out.print(JsonUtil.loadTrueResult(result));