Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-16 e8447278ebd808038d59d7e5dcbc9ec8de7432e5

 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;