Merge remote-tracking branch 'origin/master'

admin

2018-12-05 21f49216736c547d99ec1dd46a24c6f43f852fc5

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

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

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

                  totalSales);

				
            // 用户未输入最高价格时    最高价格限制99999

            if (searchfilter.getEndPrice() == null) {

               searchfilter.setEndPrice(new BigDecimal(99999));

            }

         }



         searchfilter.setPage(pageNo);