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-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingGun.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingGun.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingGun.java
index d5d50a2..2bef523 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingGun.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingGun.java
@@ -86,6 +86,10 @@
     @ApiModelProperty(value = "额定功率", required = true)
     @TableField("rated_power")
     private BigDecimal ratedPower;
+    
+    @ApiModelProperty(value = "实时充电功率", required = true)
+    @TableField("charging_power")
+    private BigDecimal chargingPower;
 
     @ApiModelProperty(value = "车位号")
     @TableField("parking_number")

--
Gitblit v1.7.1