java/PlayPai.git

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

44323

2023-10-27 820724a76b4db9ea0eeb14049473ad56ebfb6d45

refs
用户	44323 <443237572@qq.com>
	星期五, 十月 27, 2023 13:19 +0800
提交者	44323 <443237572@qq.com>
	星期五, 十月 27, 2023 13:19 +0800
提交	820724a76b4db9ea0eeb14049473ad56ebfb6d45
目录	28f630d13825dc3c8f7a7bb02262667a3dd2e764 目录 \| zip \| gz
parent	25a035eded99fe43efffd395da88f1593e33f237 查看 \| 对比 cc30fb569674fa8f82130253b68ac609ae5d8eb6 查看 \| 对比

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

 Conflicts:
	cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
	cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java
	cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java
	cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
	cloud-server-activity/src/main/resources/mapper/CouponMapper.xml
	cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CouponListOfSearch.java
	cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java

39个文件已修改

1个文件已添加

	cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/RecordAppoint.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java	13 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/StoreClient.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-activity/src/main/resources/mapper/CouponMapper.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/StudentClient.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/model/TStudent.java	114 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-competition/src/main/java/com/dsh/competition/model/ParticipantVo.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java	13 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java	57 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-course/src/main/java/com/dsh/course/feignclient/model/RecordAppoint.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-course/src/main/java/com/dsh/course/feignclient/other/StoreClient.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CouponListOfSearch.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Competition.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java	22 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSite.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java	13 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java	19 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-other/src/main/java/com/dsh/other/entity/Site.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java	27 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-other/src/main/resources/mapper/SiteMapper.xml	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史