java/PlayPai.git

玩湃

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

44323

2024-03-11 ceacc612529f38c632d85d91bb5309baa5ebb82a

refs
用户	44323 <443237572@qq.com>
	星期一, 三月 11, 2024 16:04 +0800
提交者	44323 <443237572@qq.com>
	星期一, 三月 11, 2024 16:04 +0800
提交	ceacc612529f38c632d85d91bb5309baa5ebb82a
目录	7fdef856ebc08cac3fbe9e7e0830dcc5a8250b7b 目录 \| zip \| gz
parent	a1cadd023734d1e33f6455ec87fb7e2783d808fe 查看 \| 对比 044546d30b3b242f59a9450935245bec40093324 查看 \| 对比

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

 Conflicts:
	cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java

23个文件已修改

2个文件已添加

	cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-account/src/main/resources/mapper/RefereeMapper.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java	58 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java	22 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupCompetitor.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupPaymentParticipant.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/account/UserIntegralChangesClient.java	22 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/account/model/SaveUserIntegralChangesVo.java	23 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/competition/ParticipantClient.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/mapper/WorldCupCompetitorMapper.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/mapper/WorldCupPaymentParticipantMapper.java	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/EntrantRank.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/ParticipantVo.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupCompetitorService.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupPaymentParticipantService.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java	114 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java	104 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java	87 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupCompetitorMapper.xml	53 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupPaymentParticipantMapper.xml	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_add.html	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_edit.html	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-management/src/main/webapp/static/modular/system/referee/referee.js	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史