merge changes from master

skyhit · skyhit · commit 18f9ca326de0 · 2019-07-09T13:57:48.000+08:00
diff --git a/src/main/java/com/appirio/service/challengefeeder/manager/ChallengeDetailFeederManager.java b/src/main/java/com/appirio/service/challengefeeder/manager/ChallengeDetailFeederManager.java
@@ -158,6 +158,7 @@ public void pushChallengeFeeder(ChallengeFeederParam param) throws SupplyExcepti
                         introduction += "\n" + round2Introduction;
                     }
                 }
+
                 challenge.setIntroduction(introduction);
             } else if ("DEVELOP_MARATHON_MATCH".equalsIgnoreCase(challenge.getSubTrack()) || "MARATHON_MATCH".equalsIgnoreCase(challenge.getSubTrack())) {
                 if (challenge.getMarathonMatchDetailRequirements() != null) {

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,7 @@ public void pushChallengeFeeder(ChallengeFeederParam param) throws SupplyExcepti`
`158`	`158`	`introduction += "\n" + round2Introduction;`
`159`	`159`	`}`
`160`	`160`	`}`
	`161`	`+`
`161`	`162`	`challenge.setIntroduction(introduction);`
`162`	`163`	`} else if ("DEVELOP_MARATHON_MATCH".equalsIgnoreCase(challenge.getSubTrack()) \|\| "MARATHON_MATCH".equalsIgnoreCase(challenge.getSubTrack())) {`
`163`	`164`	`if (challenge.getMarathonMatchDetailRequirements() != null) {`