From 85c4410b0948799a93f19f345b4ed18c253c89f3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 03 九月 2024 10:26:33 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 10 +---------
1 files changed, 1 insertions(+), 9 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 9c48083..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
@@ -122,7 +122,7 @@
@ApiModelProperty(value = "充值支付第三方流水号")
@TableField("recharge_serial_number")
private String rechargeSerialNumber;
-
+
@ApiModelProperty(value = "剩余金额（用于前端展示）")
@TableField("residual_amount")
private BigDecimal residualAmount;
@@ -185,12 +185,4 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("pay_time")
private LocalDateTime payTime;
-
- @ApiModelProperty(value = "累计服务费")
- @TableField("service_charge")
- private BigDecimal serviceCharge;
-
- @ApiModelProperty(value = "累计电费")
- @TableField("electrovalence")
- private BigDecimal electrovalence;
}
--
Gitblit v1.7.1