From f8e1d6d918e76e8a021d004ef0017286fc549794 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 01 十一月 2024 19:09:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingDetails.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingDetails.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingDetails.java
index 6dd6614..e45f691 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingDetails.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingDetails.java
@@ -26,7 +26,7 @@
@ApiModelProperty("续航")
private BigDecimal endurance;
@ApiModelProperty("剩余充电时间")
- private Long remainingChargeTime;
+ private Integer remainingChargeTime;
@ApiModelProperty("充电枪名")
private String name;
@ApiModelProperty("订单编号")
@@ -34,9 +34,9 @@
@ApiModelProperty("已充电度数")
private BigDecimal chargedDegrees;
@ApiModelProperty("已充电时间")
- private Long chargedTime;
+ private String chargedTime;
@ApiModelProperty("充电费用")
- private BigDecimal ChargingCost;
+ private BigDecimal chargingCost;
@ApiModelProperty("充电状态（0=未知，1=等待中，2=启动中，3=充电中，4=停止中，5=已结束）")
private Integer status;
}
--
Gitblit v1.7.1