Merge branch 'div_develop' into master_develop

yujian

2019-04-29 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf

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