From 83f6a929a4a9ee2f67cfa6dd7d059c998380141d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 12 三月 2026 17:56:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

---
 src/main/java/com/ruoyi/energy/vo/EnergyStatisticsVo.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/energy/vo/EnergyStatisticsVo.java b/src/main/java/com/ruoyi/energy/vo/EnergyStatisticsVo.java
index 0adf74c..ce29efc 100644
--- a/src/main/java/com/ruoyi/energy/vo/EnergyStatisticsVo.java
+++ b/src/main/java/com/ruoyi/energy/vo/EnergyStatisticsVo.java
@@ -1,7 +1,9 @@
 package com.ruoyi.energy.vo;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
 
@@ -10,9 +12,13 @@
 public class EnergyStatisticsVo {
 
     //寮�濮嬫棩鏈�
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate startDate;
 
     //缁撴潫鏃ユ湡
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate endDate;
 
     //鏌ヨ闂撮殧澶╂暟

--
Gitblit v1.9.3