Merge branch 'mater-1.6.0' into div

admin

2019-08-13 25b7e040153e96fd7c9f649e9b0de8932e1a2a00

 fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java

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

         return;