玩湃
parent: b85427 | 补丁 | 提交对比
puzhibing
2024-03-01 e0ec0a20cb943b4ee92c45b64f02b007a003b0ba
refs
用户 puzhibing <393733352@qq.com>
星期五, 三月 1, 2024 18:22 +0800
提交者 puzhibing <393733352@qq.com>
星期五, 三月 1, 2024 18:22 +0800
提交e0ec0a20cb943b4ee92c45b64f02b007a003b0ba
目录 240a24237e6beef7dfe7c7f279b0a2acf1bd7583 目录 | zip | gz
parent b85427676fedd373e955f24627764b8e5a29c816 查看 | 对比
fe0faf0cc923e6dcb0f7b244db0d7c34f4718b0e 查看 | 对比 
Merge remote-tracking branch 'origin/2.0' into 2.0

# Conflicts:
#	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
14个文件已修改
10个文件已添加
951 ■■■■■ 已修改文件
cloud-server-account/src/main/java/com/dsh/account/controller/RefereeController.java 52 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/entity/Referee.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/mapper/RefereeMapper.java 15 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/model/RefereeList.java 35 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/service/IRefereeService.java 12 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/service/impl/RefereeServiceImpl.java 21 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/resources/mapper/RefereeMapper.xml 43 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupInfo.java 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupService.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java 36 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/Referee.java 56 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/RefereeList.java 35 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/RefereeClient.java 34 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/RefereeController.java 73 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAgreeController.java 12 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RegionController.java 37 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/WEB-INF/view/system/referee/referee.html 79 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/QrCodeDescription.html 44 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementDriver.html 21 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/WEB-INF/view/tAgreementDriver.html 9 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/static/modular/system/referee/referee.js 315 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/controller/ProtocolController.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史