From 50dfdaf4e3220e7c1f93a189879ea92bb8f46b4c Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 25 六月 2025 17:58:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TransactionRecordMessageVO.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TransactionRecordMessageVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TransactionRecordMessageVO.java
index 78070af..f86251f 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TransactionRecordMessageVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TransactionRecordMessageVO.java
@@ -18,7 +18,7 @@
private String end_time;// 结束时间
private BigDecimal total_electricity;// 总电量
private BigDecimal loss_total_electricity;// 计损总电量
- private BigDecimal pay_amount;// 消费金额
+ private BigDecimal payment_amount;// 消费金额
private Integer method;// 交易标识（1：app 启动，2：卡启动，4：离线卡启动，5: vin 码启动充电）
private String trade_date;// 交易日期、时间
private Integer stop_reason;// 停止原因
@@ -167,6 +167,7 @@
private BigDecimal valley_charge12;// 谷电量
private BigDecimal loss_valley_charge12;// 计损谷电量
private BigDecimal valley_amount12;// 谷金额
+ private String result;//原始字符串
}
--
Gitblit v1.7.1