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

Pu Zhibing

2025-01-24 4b1453e19306592f703aa794e238bd028f67d320

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

@@ -109,7 +109,7 @@
     * @param trade_no
     * @return
     */
    ResultUtil paymentCourseCallback(String code, String trade_no, String attach) throws AlipayApiException;
    ResultUtil paymentCourseCallback(String code, String trade_no, String attach) throws Exception;