Merge branch 'master_develop' into div_develop

yujian

2019-05-13 f6ce3fd74c60cb204372b01bc68467c0ed180da7

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