Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-26 a988a89e6b0cd75a5df4691eb8196c0ef9513a05

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

@@ -104,7 +104,6 @@
    @TableField("discount_total_amount")
    private BigDecimal discountTotalAmount;


    @ApiModelProperty(value = "实际支付价格")
    @TableField("payment_amount")
    private BigDecimal paymentAmount;