From 6a8ff464c7979bc9412734de5642592b804a656c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 七月 2025 17:44:41 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/PlaceHolder.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/PlaceHolder.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/PlaceHolder.java
index e89e38a..dc9543d 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/PlaceHolder.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/PlaceHolder.java
@@ -1,5 +1,6 @@
package com.ruoyi.integration.drainage.model;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
@@ -17,26 +18,31 @@
* 免费时长
*/
@NotNull
- private Integer FreeTime;
+ @JsonProperty("FreeTime")
+ private Integer freeTime;
/**
* 嘴阀占位费
*/
@NotNull
- private BigDecimal MaxFee;
+ @JsonProperty("MaxFee")
+ private BigDecimal maxFee;
/**
* 生效开始时间
* yyyy-MM-dd HH:mm:ss
*/
@NotNull
- private String EffectStartTime;
+ @JsonProperty("EffectStartTime")
+ private String effectStartTime;
/**
* 生效结束时间
*/
@NotNull
- private String EffectEndTime;
+ @JsonProperty("EffectEndTime")
+ private String effectEndTime;
/**
* 占位费价格
*/
@NotNull
- private List<PlaceHolderPrice> PlaceHolderPrices;
+ @JsonProperty("PlaceHolderPrices")
+ private List<PlaceHolderPrice> placeHolderPrices;
}
--
Gitblit v1.7.1