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

admin

2019-08-22 0753e8e2febe83f13d9d7a6071fa5f7b57d7d7f1

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

@@ -77,7 +77,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(XcxMiniControllerUtil.NODATA));

         return;