玩湃
parent: cbca62 | 补丁 | 提交对比
puzhibing
2024-02-22 11f6d2627ce8eb37c6460892509460b0e19e5656
refs
用户 puzhibing <393733352@qq.com>
星期四, 二月 22, 2024 17:00 +0800
提交者 puzhibing <393733352@qq.com>
星期四, 二月 22, 2024 17:00 +0800
提交11f6d2627ce8eb37c6460892509460b0e19e5656
目录 c5d8d00794370aa1c833f0655b6de94ed8ed91f3 目录 | zip | gz
parent cbca62b053eb3dc3cc7754aa0062aaf1e04e2cb4 查看 | 对比
640ff18d2d7f4be02ddb7f8f75e899f05545eb98 查看 | 对比 
Merge branch '1.0-bug' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

 Conflicts:
	cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
29个文件已修改
12个文件已添加
1203 ■■■■■ 已修改文件
cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/controller/StudentHonorController.java 59 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/entity/StudentHonor.java 11 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/IntroduceRewardsClient.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/HonorRulesClient.java 30 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/model/HonorRules.java 21 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/service/StudentHonorService.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/service/impl/StudentHonorServiceImpl.java 121 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java 135 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java 10 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java 46 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-competition/src/main/java/com/dsh/competition/entity/UserCompetition.java 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/StudentHonorClient.java 20 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/model/StudentHonor.java 19 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-competition/src/main/java/com/dsh/competition/model/PaymentCompetitionVo.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java 52 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-competition/src/main/java/com/dsh/competition/util/TaskUtilCompetition.java 36 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java 41 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java 123 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/feignclient/account/StudentHonorClient.java 20 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/feignclient/account/model/StudentHonor.java 19 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java 99 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java 22 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/StudentHonorClient.java 20 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/StudentHonor.java 19 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CancelledClassesClient.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageSchedulingClient.java 1 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java 41 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java 28 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SiteBooking.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java 45 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java 1 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/controller/HonorRulesController.java 49 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/feignclient/account/StudentHonorClient.java 20 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/feignclient/account/model/StudentHonor.java 19 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java 31 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/resources/mapper/GameMapper.xml 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史