Merge remote-tracking branch 'origin/master'

nickchange

2023-12-08 1b9a01bf5000714b08a75a50dd1f5f3eab65d888

 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;
}