From 4e7f81ab7b37b5fc51c3054a36942adbcfb8dca8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 03 九月 2024 19:12:00 +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 10018dc..c43fb06 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
@@ -122,7 +122,7 @@
@ApiModelProperty(value = "充值支付第三方流水号")
@TableField("recharge_serial_number")
private String rechargeSerialNumber;
-
+
@ApiModelProperty(value = "剩余金额（用于前端展示）")
@TableField("residual_amount")
private BigDecimal residualAmount;
@@ -185,5 +185,5 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("pay_time")
private LocalDateTime payTime;
-
+
}
--
Gitblit v1.7.1