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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 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;

}