合并代码

puzhibing

2024-12-23 d9609af285755011115e8f4c64634740f7dd05c2

 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;