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

mitao

2025-04-11 7d22ca5a1c9416e84430a3997664e17861a2951e

 cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java

@@ -192,4 +192,9 @@

    @TableField(exist = false)
    private Integer orderId;
    @TableField("giftClassHours")
    private Integer giftClassHours;
    // 所选课时规格id
    @TableField(exist = false)
    private Integer coursePackageConfigId;
}