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

puzhibing

2024-03-01 e0ec0a20cb943b4ee92c45b64f02b007a003b0ba

 cloud-server-course/src/main/java/com/dsh/course/model/vo/RegisterCourseVo.java

@@ -34,4 +34,12 @@
    @ApiModelProperty(value = "课包类型id")
    private Integer coursePackTypeId;

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

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

}