Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-25 2493985a5bdfc6496381b39de0f9713b79c2e51d

 cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackageService.java

@@ -87,7 +87,7 @@

    List<Map<String, Object>> queryByConfigId(Integer oneId);

    Integer getHours(Integer coursePackageId);
    List<Integer> getHours(Integer coursePackageId);

    ResultUtil paymentCourseCouponList(Integer uid, Integer coursePackagePaymentConfigId);