From 4ec71930da15cc83b2fbf67fdeade89b8900b14c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 31 三月 2026 17:32:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/energy/vo/EnergyStatisticsVo.java | 12 ++++++++++++
1 files changed, 12 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..09f8a21 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;
//鏌ヨ闂撮殧澶╂暟
@@ -20,4 +26,10 @@
//鑳借�楀満鏅�(鍔炲叕/鐢熶骇)
private String type;
+
+ //鑳借�楃被鍨�(姘�/鐢�/姘�)
+ private String energyName;
+
+ //鏃�/鏈�/骞�
+ private String state;
}
--
Gitblit v1.9.3