From be40f9a0f85d6c4027e5ca61c53cd491b5b095e6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 19:21:16 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/MyChargingOrderList.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/MyChargingOrderList.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/MyChargingOrderList.java
index e38ea6e..0173c0d 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/MyChargingOrderList.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/MyChargingOrderList.java
@@ -21,6 +21,8 @@
private String title;
@ApiModelProperty("充电度数")
private BigDecimal chargingDegree;
+ @ApiModelProperty("充电枪id")
+ private Integer chargingGunId;
@ApiModelProperty("充电桩枪名称")
private String name;
@ApiModelProperty("结束方式（0=异常终止，1=主动终止，2=满电终止，3=费用不足终止）")
@@ -29,4 +31,10 @@
private BigDecimal payMoney;
@ApiModelProperty("订单时间")
private String createTime;
+ @ApiModelProperty("评价状态（1=待评价，2=已评价）")
+ private Long evaluate;
+ @ApiModelProperty("电费")
+ private BigDecimal electricCharge;
+ @ApiModelProperty("服务费")
+ private BigDecimal serviceCharge;
}
--
Gitblit v1.7.1