From e5773b55b0d952f81dcc3dff4a372a0d40028efe Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 29 十月 2024 10:32:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingDetails.java | 2 +-
1 files changed, 1 insertions(+), 1 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 18e2fbe..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
@@ -34,7 +34,7 @@
@ApiModelProperty("已充电度数")
private BigDecimal chargedDegrees;
@ApiModelProperty("已充电时间")
- private Integer chargedTime;
+ private String chargedTime;
@ApiModelProperty("充电费用")
private BigDecimal chargingCost;
@ApiModelProperty("充电状态（0=未知，1=等待中，2=启动中，3=充电中，4=停止中，5=已结束）")
--
Gitblit v1.7.1