Merge branch 'master-2.0-pre-rename' into div

admin

2019-09-11 e6670f2a6513c0f1d6e4f2d867d1010970014849

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java

@@ -173,7 +173,7 @@
         if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))

            root.put("scoreExchange", getScoreExchangeInfo(acceptData));



         if (VersionUtil.greaterThan_2_0_0(acceptData.getPlatform(), acceptData.getVersion()))

         if (VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion()))

            root.put("searchDiscovery", getSearchDiscoveryInfo(acceptData));



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