From 93c64d57fa870193d4971509d0a20c3be8779565 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 22 八月 2024 16:44:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
index 81744d1..58d079d 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -118,7 +118,7 @@
@TableField("app_coupon_id")
private Long appCouponId;
- @ApiModelProperty(value = "优惠金额")
+ @ApiModelProperty(value = "优惠券抵扣金额")
@TableField("coupon_discount_amount")
private BigDecimal couponDiscountAmount;
@@ -130,7 +130,7 @@
@TableField("vip_discount_amount")
private BigDecimal vipDiscountAmount;
- @ApiModelProperty(value = "支付金额")
+ @ApiModelProperty(value = "支付金额（实付）")
@TableField("payment_amount")
private BigDecimal paymentAmount;
--
Gitblit v1.7.1