Merge remote-tracking branch 'origin/master'

admin

2019-03-01 bb688ff2b4b42bc440a8e7145f53e9030073fa6a

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

   }