Merge branch 'master' into dev-msg

admin

2019-01-15 5797fc7e8267d634ee64fd27cdea2a834091681e

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

   }