玩湃
parent: c0f629 | 补丁 | 提交对比
puzhibing
2023-07-06 2b4511ca363e74343e1cb678c23a9e7638800a3f
refs
用户 puzhibing <393733352@qq.com>
星期四, 七月 6, 2023 17:33 +0800
提交者 puzhibing <393733352@qq.com>
星期四, 七月 6, 2023 17:33 +0800
提交2b4511ca363e74343e1cb678c23a9e7638800a3f
目录 0b89ffeb1199884f8f6fc4dfb5b056e327135f21 目录 | zip | gz
parent c0f6294b0be6789fddd652f89f820fcf6d5526cf 查看 | 对比
0ce090ba49e37710a129cf21ac762bbe43bcd50b 查看 | 对比 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java
11个文件已添加
21个文件已修改
438 ■■■■■ 已修改文件
cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java 27 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/IntroduceRewardsClient.java 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntrduceOfUserRequest.java 21 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CancelListClient.java 9 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseRecordClient.java 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseSessionNameClient.java 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/StoreClient.java 11 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/RegisterCourseVo.java 28 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java 38 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java 10 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/IntroduceRewardsClient.java 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntrduceOfUserRequest.java 21 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java 11 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java 18 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/GetStuSourseList.java 19 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java 11 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java 16 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/controller/CourseRecordController.java 9 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/feignclient/CancelListClient.java 9 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/feignclient/CoursePaymentClient.java 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseRecordClient.java 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseSessionNameClient.java 14 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/feignclient/model/GetStuOfCoursesDetails.java 13 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/feignclient/model/GetStuSessionList.java 20 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/feignclient/model/GetStudentCourse.java 14 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/model/vo/CourseDetailRequest.java 23 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/model/vo/StuCourseRequest.java 15 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java 11 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/feignclient/StoreClient.java 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/feignclient/model/GetAllNearbyStoreList.java 13 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史