Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-26 43c5fba6b962a6544af2efef3272f34b72adcca7

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TVipOrder.java

@@ -64,7 +64,7 @@
    @TableField("discount_amount")
    private BigDecimal discountAmount;

    @ApiModelProperty(value = "支付金额")
    @ApiModelProperty(value = "实付支付金额")
    @TableField("payment_amount")
    private BigDecimal paymentAmount;