From 2d2d58f78780767d8172081f8087ae412855527e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 14 十月 2026 13:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.3' into 2.3
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java | 7 +++++++
1 files changed, 7 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 c175952..fd40572 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
@@ -43,6 +43,10 @@
private String reservationStartTime;
@ApiModelProperty(value = "允许预约结束时间，格式HH:mm")
private String reservationEndTime;
+ @ApiModelProperty(value = "允许预约多时段JSON数组")
+ private String reservationTimeRanges;
+ @ApiModelProperty(value = "最早可提前预约分钟数")
+ private Integer reservationAheadMinute;
@ApiModelProperty(value = "是否支持VIN码识别")
private Integer vinFlag;
@@ -60,6 +64,9 @@
@ApiModelProperty(value = "是否命中白名单")
private Boolean whitelistMatched = false;
+ @ApiModelProperty(value = "白名单账户可用余额（企业账户充电显示，共享模式=公司可用余额，分配模式=白名单用户余额）")
+ private BigDecimal whitelistBalance;
+
@ApiModelProperty(value = "白名单权益：1=全部免费，2=免电费，3=免服务费")
private Integer whitelistBenefitType;
--
Gitblit v1.7.1