From a0400e48a2e8f50c457e1c4d4ba19bab2a0d1301 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 02 四月 2026 08:58:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/energy/dto/EnergyCostDto.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/energy/dto/EnergyCostDto.java b/src/main/java/com/ruoyi/energy/dto/EnergyCostDto.java
index a24880e..9a9fa97 100644
--- a/src/main/java/com/ruoyi/energy/dto/EnergyCostDto.java
+++ b/src/main/java/com/ruoyi/energy/dto/EnergyCostDto.java
@@ -16,9 +16,7 @@
public class EnergyCostDto {
@ApiModelProperty("鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private LocalDate meterReadingDate;
+ private String meterReadingDate;
@ApiModelProperty("鐢ㄦ按閲�")
private BigDecimal waterConsumption;
--
Gitblit v1.9.3