Merge remote-tracking branch 'origin/div' into div

admin

2019-09-03 74ee9c42c1d87f3724a21e92871bc8c95c8364c6

 fanli/src/main/java/com/yeshi/fanli/controller/h5/H5SearchController.java

@@ -301,7 +301,7 @@
       * out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NOSYSTEM));

       * return; }

       */

      List<SuperHotSearch> superHotSearchList = superHotSearchSerivce.getSuperHotSearchBySystemId(4); // 返利券app

      List<SuperHotSearch> superHotSearchList = superHotSearchSerivce.getSuperHotSearchBySystemId(4, null); // 返利券app

      if (superHotSearchList == null || superHotSearchList.size() == 0) {

         out.print(JsonUtil.loadFalseResult(H5ControllerUtil.NODATA));

         return;