Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-04 c5cb162b5cbdb589e97290fba3ac3e9241ec48d4

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

@@ -10,6 +10,12 @@

@Data
public class DiscountJsonDto {

    /**
     * type为1，为会员折扣现金支付金额;type为3，为限时折扣现金支付金额
     */
    @ApiModelProperty(value = "课时数")
    private Integer courseHours;
    /**
     * type为1，为会员折扣现金支付金额;type为3，为限时折扣现金支付金额
     */