Merge branch 'master' into dev1

Administrator

2018-11-21 c558c4f1130debfd785c74ff0e963afc6455f196

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

@@ -516,6 +516,7 @@
            // 设置SearchFilter

            taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter,

                  totalSales);

            searchfilter.setEndPrice(new BigDecimal(10000));

         }



         searchfilter.setPage(pageNo);