Merge branch 'dev-msg'

admin

2019-01-22 0e552c5dba18d27622116a7d7a6e04fc99f8e8a7

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

   }