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

puzhibing

2024-03-01 e0ec0a20cb943b4ee92c45b64f02b007a003b0ba

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

@@ -194,4 +194,7 @@
    private Integer orderId;
    @TableField("giftClassHours")
    private Integer giftClassHours;
    // 所选课时规格id
    @TableField(exist = false)
    private Integer coursePackageConfigId;
}