From 9ce27f53094be15ee2e69c0dce31e3f324bfda99 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 15:06:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1

---
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/PlaceHolder.java |   10 +++++-----
 1 files changed, 5 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..1687ea9 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
@@ -17,26 +17,26 @@
 	 * 免费时长
 	 */
 	@NotNull
-	private Integer FreeTime;
+	private Integer freeTime;
 	/**
 	 * 嘴阀占位费
 	 */
 	@NotNull
-	private BigDecimal MaxFee;
+	private BigDecimal maxFee;
 	/**
 	 * 生效开始时间
 	 * yyyy-MM-dd HH:mm:ss
 	 */
 	@NotNull
-	private String EffectStartTime;
+	private String effectStartTime;
 	/**
 	 * 生效结束时间
 	 */
 	@NotNull
-	private String EffectEndTime;
+	private String effectEndTime;
 	/**
 	 * 占位费价格
 	 */
 	@NotNull
-	private List<PlaceHolderPrice> PlaceHolderPrices;
+	private List<PlaceHolderPrice> placeHolderPrices;
 }

--
Gitblit v1.7.1