From cb63313e5e30efc4f246546c9c7f07ffeff4a0e2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 02 九月 2024 19:55:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java |    6 ++++++
 1 files changed, 6 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 df3a14a..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,16 @@
     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;
 

--
Gitblit v1.7.1