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

puzhibing

2024-03-11 334fbd5f1a5a4e85c198560bd024211ba4cf99b1

 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;

}