java/PlayPai.git

玩湃

Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

puzhibing

2024-03-25 f401b388a30a760431ff0648dbfcd95d24112e5b

refs
用户	puzhibing <393733352@qq.com>
	星期一, 三月 25, 2024 17:37 +0800
提交者	puzhibing <393733352@qq.com>
	星期一, 三月 25, 2024 17:37 +0800
提交	f401b388a30a760431ff0648dbfcd95d24112e5b
目录	5e991d35dfa8f187935d580680c66381788067b8 目录 \| zip \| gz
parent	322aa077cbf5a47189550d01eac2dfe2d1830f5b 查看 \| 对比 d42f32d6c6ff2cbaab2fbdabbeefb2367e72d446 查看 \| 对比

Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

 Conflicts:
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java

4个文件已修改

	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java	13 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java	91 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-other/src/main/java/com/dsh/other/entity/TGameConfig.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史