From cbad982befcf58521b224da1e8898c23c5e0d2c6 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 29 五月 2025 16:49:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/PolicyInfo.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/PolicyInfo.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/PolicyInfo.java
index 8d0daa3..b0dfa48 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/PolicyInfo.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/PolicyInfo.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,15 +18,18 @@
* HHmmss
*/
@NotNull
- private String StartTime;
+ @JsonProperty("StartTime")
+ private String startTime;
/**
* 时段电费
*/
@NotNull
- private BigDecimal ElecPrice;
+ @JsonProperty("ElecPrice")
+ private BigDecimal elecPrice;
/**
* 时段服务费
*/
@NotNull
- private BigDecimal SevicePrice;
+ @JsonProperty("SevicePrice")
+ private BigDecimal sevicePrice;
}
--
Gitblit v1.7.1