Merge remote-tracking branch 'origin/master'

44323

2023-10-11 f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3

 cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java

@@ -1,5 +1,6 @@
package com.dsh.account.feignclient.course;

import com.dsh.account.dto.TCoursePackagePayment1;
import com.dsh.account.feignclient.competition.model.BillingDataRequestVo;
import com.dsh.account.feignclient.course.model.*;
import com.dsh.account.model.BillingRequest;
@@ -48,6 +49,14 @@
    @PostMapping("/base/coursePack/delPaymentCoursePackage")
    public boolean delPaymentCoursePackage(@RequestBody Integer payId);


    @PostMapping("/base/coursePack/getCoursePackagePaymentById")
    public TCoursePackagePayment getCoursePackagePaymentById(@RequestBody Long id);


    @PostMapping("/base/coursePack/getCoursePackagePaymentById")
    public TCoursePackagePayment1 getCoursePackagePaymentById1(@RequestBody Long id);

    @PostMapping("/base/coursePack/updatePaymentCoursePackage")
    void updatePaymentCoursePackage(@RequestBody TCoursePackagePayment coursePackagePayment);

@@ -65,7 +74,7 @@
    List<TCoursePackagePayment> getCoursePackagePaymentOfCode(@RequestBody String code);

    @PostMapping("/base/coursePack/sendHours")
    Boolean sendHours(String s);
    Integer sendHours(String s);

    @PostMapping("/base/coursePack/getClassHour")
    Integer getClassHour(Integer courseConfigId);