From 0f4459e4201fdc19185b7dd03215871f036acd70 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 28 五月 2025 16:45:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev

---
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ChargeDetail.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 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 c797217..2823806 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
@@ -1,5 +1,6 @@
 package com.ruoyi.integration.drainage.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
@@ -18,36 +19,43 @@
 	 * yyyy-MM-dd HH:mm:ss
 	 */
 	@NotNull
+	@JsonProperty("DetailStartTime")
 	private String detailStartTime;
 	/**
 	 * 结束时间
 	 * yyyy-MM-dd HH:mm:ss
 	 */
 	@NotNull
+	@JsonProperty("DetailEndTime")
 	private String detailEndTime;
 	/**
 	 * 时段电价
 	 */
 	@Null
+	@JsonProperty("ElecPrice")
 	private BigDecimal elecPrice;
 	/**
 	 * 时段服务费价格
 	 */
 	@Null
+	@JsonProperty("SevicePrice")
 	private BigDecimal sevicePrice;
 	/**
 	 * 时段充电量
 	 */
 	@Null
+	@JsonProperty("DetailPower")
 	private BigDecimal detailPower;
 	/**
 	 * 时段电费
 	 */
 	@Null
+	@JsonProperty("DetailElecMoney")
 	private BigDecimal detailElecMoney;
 	/**
 	 * 时段服务费
 	 */
 	@Null
+	@JsonProperty("DetailSeviceMoney")
 	private BigDecimal detailSeviceMoney;
 }

--
Gitblit v1.7.1