Merge remote-tracking branch 'origin/master'

yujian

2019-05-29 6c224068b1ea8c3f92453bef5175e629deaf780f

 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSearchController.java

@@ -177,7 +177,7 @@
         return;

      }



      String kw = goodsClassService.getKwById(id);

      String kw = goodsClassService.getKeysById(id);

      filter = "[{\"type\": \"quantype\"}]";

      JSONObject data = search(kw, pagesize, filter, order, startprice, endprice);

      // if (StringUtil.isNullOrEmpty(kw)) {