From d61ada7b575417f00438ca2df140870249fca721 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期二, 25 三月 2025 19:25:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java b/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java
index 97396e8..3a331cf 100644
--- a/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java
+++ b/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java
@@ -38,11 +38,21 @@
private String paramValue;
- /** 閲囬泦鏃堕棿 */
+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date collectTime;
+ /** 閲囬泦鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date stopTime;
+
/** 鍙傛暟鍚嶇О */
@Excel(name = "鍙傛暟鍚嶇О")
--
Gitblit v1.9.3