Merge remote-tracking branch 'origin/master'

xuhy

2025-11-17 556e213d7ff7120616c9814126c2c70413f2c527

Merge remote-tracking branch 'origin/master'

 ruoyi-system/src/main/java/com/ruoyi/system/model/TCourseOrder.java

@@ -72,7 +72,7 @@
    @TableField("id_card")
    private String idCard;

    @ApiModelProperty(value = "支付状态 1=待支付 2=已支付 3=已退款  4=已取消  5=已完成")
    @ApiModelProperty(value = "支付状态 1=待支付 2=已支付 3=已退款  4=已取消  5=已完成 6退款中")
    @TableField("pay_status")
    private Integer payStatus;