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/model/vo/RegisterCourseVo.java

@@ -36,5 +36,10 @@

    @ApiModelProperty(value = "1常规 2假期 3体验")
    private Integer type;
    @ApiModelProperty(value = "假期课时间段")
    private String time;

    @ApiModelProperty(value = "订单id")
    private Long orderId;

}