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/vo/ChargingOrderVO.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java
index ab1db5f..61ba66b 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java
@@ -13,14 +13,14 @@
import java.util.List;
@Data
-@ApiModel(value = "SiteDetailEvaluateVO对象",description = "站点详情订单评价")
+@ApiModel(value = "ChargingOrderVO对象",description = "充电订单列表VO")
public class ChargingOrderVO extends TChargingOrder {
@ApiModelProperty(value = "站点名称")
private String siteName;
@ApiModelProperty(value = "充电终端名称 桩+枪")
private String terminalName;
@ApiModelProperty(value = "充电时间 秒")
- private Integer chargingSecond;
+ private Long chargingSecond;
@ApiModelProperty(value = "平台手续费")
private BigDecimal platFormMoney;
@ApiModelProperty(value = "三方平台分佣")
@@ -29,15 +29,10 @@
private String licensePlate;
@ApiModelProperty(value = "手机号")
private String phone;
- @ApiModelProperty(value = "累计充电量")
- private BigDecimal chargingCapacity;
- @ApiModelProperty(value = "累计电费")
- private BigDecimal electrovalence;
- @ApiModelProperty(value = "累计服务费")
- private BigDecimal serviceCharge;
+
+
@ApiModelProperty(value = "时段数")
private Integer count;
@ApiModelProperty(value = "1明星充电 2快电 3新电途")
private Integer orderSource;
-
}
--
Gitblit v1.7.1