From ed8fc5f674544d3af63c6f68093ffc038385c493 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 16 十二月 2024 09:30:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dto/DaPointDTO.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dto/DaPointDTO.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dto/DaPointDTO.java
index 7d56e18..55a1c57 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dto/DaPointDTO.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dto/DaPointDTO.java
@@ -1,5 +1,6 @@
 package com.iailab.module.data.point.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.iailab.framework.common.validation.group.AddGroup;
 import com.iailab.framework.common.validation.group.UpdateGroup;
 import com.iailab.framework.excel.core.annotations.DictFormat;
@@ -127,4 +128,15 @@
 
     @Schema(description = "累计点")
     private DaCumulatePointDTO cumulatePoint;
+
+    @Schema(description = "采集值")
+    private String collectValue;
+
+    @Schema(description = "采集质量")
+    private String collectQuality;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Schema(description = "采集时间")
+    private Date collectTime;
+
 }
\ No newline at end of file

--
Gitblit v1.9.3