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

diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java
index c3d2f73..7507994 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java
@@ -14,6 +14,8 @@
     private String name;
     @ApiModelProperty(value = "桩id")
     private Integer chargingPileId;
+    @ApiModelProperty(value = "站点id")
+    private Integer siteId;
     @ApiModelProperty(value = "桩编号")
     private String number;
     @ApiModelProperty(value = "充电枪id")
@@ -40,5 +42,5 @@
     @ApiModelProperty(value = "上次选择车辆品牌")
     private String vehicleBrand;
     @ApiModelProperty(value = "上次选择车辆id")
-    private Long id;
+    private String id;
 }

--
Gitblit v1.7.1