Merge branch 'dev1'

Administrator

2018-11-27 acd2b6eaf5ebd1a9d5aa1f54a741dfa6fc52ac10

 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);