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

无关风月

2025-03-28 8064549857d1cbfc9e7b80024f666a3b006ed3e0

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

@@ -24,5 +24,5 @@
    @ApiModelProperty(value = "优惠券id", dataType = "long", required = false)
    private Long couponId;
    @ApiModelProperty(value = "订单id", dataType = "int", required = false)
    private Integer orderId;
    private Long orderId;
}