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

@@ -40,6 +40,6 @@
    private String time;

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

}