From 14f62b1e99c93facce4245dbae56b9f43cb0e017 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 18 九月 2024 18:23:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 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 39fae79..2d71dfa 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,10 +14,25 @@
     private String name;
     @ApiModelProperty(value = "桩编号")
     private String number;
+    @ApiModelProperty(value = "充电枪id")
+    private Integer chargingGunId;
     @ApiModelProperty(value = "普通电价")
     private BigDecimal electrovalence;
     @ApiModelProperty(value = "会员电价")
     private BigDecimal vipElectrovalence;
+    @ApiModelProperty(value = "开通会员预计可省")
+    private BigDecimal money;
+    @ApiModelProperty(value = "额外赠送优惠券X张")
+    private Integer couponCount;
     @ApiModelProperty(value = "超时占位费说明")
     private String spaceChargeExplain;
+
+    @ApiModelProperty(value = "上次选择车辆logo")
+    private String carLogo;
+    @ApiModelProperty(value = "上次选择车辆车牌号")
+    private String licensePlate;
+    @ApiModelProperty(value = "上次选择车辆品牌")
+    private String vehicleBrand;
+    @ApiModelProperty(value = "上次选择车辆id")
+    private Long id;
 }

--
Gitblit v1.7.1