Merge branch 'master_online_hw' into master_test_hw

# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java

serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java

@@ -320,6 +320,7 @@ public class FightUtil {
                     .setProperty(property.substring(0, property.length()-1))
                     .setStar(hero.getStar())
                     .setPosition(teamPosHeroInfo.getPosition())
+                    .setSkinId(hero.getSkin())
                     .build();
             heroFightInfos.add(heroFightInfo);
         }