From 94b0a6092c7bcc11bec5f8a3cbee3c46acf12a23 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 23 十月 2024 19:14:37 +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/vo/ChargingOrderListVO.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
index 286972a..57bc9ba 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
@@ -14,6 +14,8 @@
 public class ChargingOrderListVO  {
     @ApiModelProperty(value = "电站名称")
     private String siteName;
+    @ApiModelProperty(value = "订单状态")
+    private Integer status;
     @ApiModelProperty(value = "电站id")
     private Integer siteId;
     @ApiModelProperty(value = "充电桩id")
@@ -34,12 +36,18 @@
     private Long chargingSecond;
     @ApiModelProperty(value = "充电电流 度")
     private BigDecimal chargingCapacity;
+    @ApiModelProperty(value = "充电电流 度")
+    private BigDecimal electricity;
+    @ApiModelProperty(value = "充电到账金额")
+    private BigDecimal orderAmount;
     @ApiModelProperty(value = "车牌号")
     private String licensePlate;
     @ApiModelProperty(value = "客户手机号")
     private String phone;
     @ApiModelProperty(value = "充电到账金额")
     private BigDecimal paymentAmount;
+    @ApiModelProperty(value = "充电后剩余金额")
+    private BigDecimal residualAmount;
     @ApiModelProperty(value = "累计电费")
     private BigDecimal electrovalence;
     @ApiModelProperty(value = "累计服务费")

--
Gitblit v1.7.1