From 3805534a85a9f9389dce859818b75b0f1059ee44 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 15 八月 2024 20:58:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
index 3f36bcb..7cfd713 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -67,6 +67,14 @@
     @ApiModelProperty(value = "充电枪id")
     @TableField("charging_gun_id")
     private Integer chargingGunId;
+    
+    @ApiModelProperty(value = "充电总度数")
+    @TableField("charging_capacity")
+    private BigDecimal chargingCapacity;
+    
+    @ApiModelProperty(value = "充电功率")
+    @TableField("charging_power")
+    private BigDecimal chargingPower;
 
     @ApiModelProperty(value = "充电开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

--
Gitblit v1.7.1