Merge remote-tracking branch 'origin/master'

admin

2019-01-23 324aea6f8b2d36ea5b6fc1b03d29ad8dfae40259

 fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java

@@ -480,7 +480,8 @@
      }



      Gson gson = new GsonBuilder().create();

      data.put("words", gson.toJson(listRecommendWords));

      if (data != null)

         data.put("words", gson.toJson(listRecommendWords));



      out.print(JsonUtil.loadTrueResult(data));

   }