Merge branch 'refs/heads/dev-xym-update-guarantee' into pre-master

ad-engine-server/src/main/java/com/tzld/piaoquan/ad/engine/server/controller/AdRecommendController.java

@@ -74,7 +74,7 @@ public class AdRecommendController {
                 if (rankResult.getExt().containsKey("isGuaranteeType") && (boolean) rankResult.getExt().get("isGuaranteeType")) {
                     participateCompetitionType.add("guarantee");
                 }
-                contentMap.put("participateCompetitionType", participateCompetitionType);
+                contentMap.put("participateCompetitionType", StringUtils.join(participateCompetitionType, ","));
                 map.put("content", contentMap);
                 return map;
             }