From e648e97ead73b1c5e9e7f0a51d8e6fd8d776a36f Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 24 六月 2025 15:16:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/plant/vo/PlantChartDataVO.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/plant/vo/PlantChartDataVO.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/plant/vo/PlantChartDataVO.java
index 02edafb..9c58724 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/plant/vo/PlantChartDataVO.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/plant/vo/PlantChartDataVO.java
@@ -1,9 +1,10 @@
package com.iailab.module.ansteel.plant.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
-import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -16,13 +17,19 @@
public class PlantChartDataVO implements Serializable {
private static final long serialVersionUID = 1L;
- private String id;
+ private String indType;
private String indCode;
private String indName;
- private String indType;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+
+ List<String> categories;
private List<Map<String, Object>> indAvgHisList;
--
Gitblit v1.9.3