Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 cloud-server-competition/src/main/java/com/dsh/competition/feignclient/course/CoursePackagePaymentClient.java

@@ -18,6 +18,7 @@

    /**
     * 获取学员剩余课时
     *
     * @param id
     * @return
     */
@@ -38,6 +39,7 @@

    /**
     * 取消报名赛事后回退学员课时
     *
     * @param paymentDeductionClassHour
     */
    @PostMapping("/coursePackagePayment/rollbackPaymentDeductionClassHour")