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

puzhibing

2024-03-11 75d8795d4a8444071f348be4082455f2ca078ffe

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

@@ -23,4 +23,6 @@
    private String studentIds;
    @ApiModelProperty(value = "优惠券id", dataType = "long", required = false)
    private Long couponId;
    @ApiModelProperty(value = "订单id", dataType = "int", required = false)
    private Long orderId;
}