玩湃
parent: a8f90f | 补丁 | 提交对比
puzhibing
2024-03-05 6d5893672dc31b6c7bfa39801ddd95516014c380
refs
用户 puzhibing <393733352@qq.com>
星期二, 三月 5, 2024 14:12 +0800
提交者 puzhibing <393733352@qq.com>
星期二, 三月 5, 2024 14:12 +0800
提交6d5893672dc31b6c7bfa39801ddd95516014c380
目录 f0d226385414916d6492676763c615d43b6df4df 目录 | zip | gz
parent a8f90f717c73d7ff4d2355649f9f161a6f89aa9b 查看 | 对比
9b7d12d6dbfd627e983d3b643b0a8bc7b528d8c1 查看 | 对比 
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/controller/WorldCupController.java
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupService.java
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
1个文件已添加
7个文件已修改
160 ■■■■■ 已修改文件
cloud-server-account/src/main/java/com/dsh/account/controller/RefereeController.java 10 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java 12 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCup.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/mapper/WorldCupMapper.java 13 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupListAll.java 35 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupService.java 9 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java 30 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml 49 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史