From 533c26ca01cee2e0883cd43ad808bc3267937db8 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 02 九月 2024 19:04:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 6 ++++--
1 files changed, 4 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 d557021..894820f 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
@@ -123,6 +123,10 @@
@TableField("recharge_serial_number")
private String rechargeSerialNumber;
+ @ApiModelProperty(value = "剩余金额（用于前端展示）")
+ @TableField("residual_amount")
+ private BigDecimal residualAmount;
+
@ApiModelProperty(value = "订单金额(总金额)")
@TableField("order_amount")
private BigDecimal orderAmount;
@@ -181,6 +185,4 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("pay_time")
private LocalDateTime payTime;
-
-
}
--
Gitblit v1.7.1