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

无关风月

10 天以前 c560f1a14ae1fc468d90e50e6a32d805295875da

 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;

}