Merge branch 'dev_2'

yujian

2019-05-14 1823108940bb5fda2d26787236dc5df3004bc0ec

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

@@ -620,6 +620,8 @@
         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));