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/ChargeDetail.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ChargeDetail.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ChargeDetail.java
index 8eabde6..c797217 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ChargeDetail.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ChargeDetail.java
@@ -18,36 +18,36 @@
 	 * yyyy-MM-dd HH:mm:ss
 	 */
 	@NotNull
-	private String DetailStartTime;
+	private String detailStartTime;
 	/**
 	 * 结束时间
 	 * yyyy-MM-dd HH:mm:ss
 	 */
 	@NotNull
-	private String DetailEndTime;
+	private String detailEndTime;
 	/**
 	 * 时段电价
 	 */
 	@Null
-	private BigDecimal ElecPrice;
+	private BigDecimal elecPrice;
 	/**
 	 * 时段服务费价格
 	 */
 	@Null
-	private BigDecimal SevicePrice;
+	private BigDecimal sevicePrice;
 	/**
 	 * 时段充电量
 	 */
 	@Null
-	private BigDecimal DetailPower;
+	private BigDecimal detailPower;
 	/**
 	 * 时段电费
 	 */
 	@Null
-	private BigDecimal DetailElecMoney;
+	private BigDecimal detailElecMoney;
 	/**
 	 * 时段服务费
 	 */
 	@Null
-	private BigDecimal DetailSeviceMoney;
+	private BigDecimal detailSeviceMoney;
 }

--
Gitblit v1.7.1