Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

4 天以前 c560f1a14ae1fc468d90e50e6a32d805295875da

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java

@@ -1396,7 +1396,7 @@
                    vo.setType(10);
                    userIntegralChangesClient.saveUserIntegralChanges(vo);
                }
                worldCupCompetitor.setOpponentScore(redScore);
                worldCupCompetitor.setOpponentScore(blueScore);
                worldCupCompetitor.setParticipationIntegral(worldCup.getParticipationIntegral());
                //增加积分明细
                SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();