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

mitao

2025-04-11 7d22ca5a1c9416e84430a3997664e17861a2951e

 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;