From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhitan-system/src/main/java/com/zhitan/alarm/domain/dto/AlarmAnalysisDTO.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/alarm/domain/dto/AlarmAnalysisDTO.java b/zhitan-system/src/main/java/com/zhitan/alarm/domain/dto/AlarmAnalysisDTO.java
index 5ca1ddf..507f1c0 100644
--- a/zhitan-system/src/main/java/com/zhitan/alarm/domain/dto/AlarmAnalysisDTO.java
+++ b/zhitan-system/src/main/java/com/zhitan/alarm/domain/dto/AlarmAnalysisDTO.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zhitan.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -13,8 +14,7 @@
* @author hmj
* @date 2024-10-16 17:55
*/
-@Getter
-@Setter
+@Data
public class AlarmAnalysisDTO {
@ApiModelProperty(value = "鑺傜偣id")
private String nodeId;
@@ -28,18 +28,23 @@
/**
* 缁熻寮�濮嬫椂闂�
*/
+ @ApiModelProperty(value = "缁熻寮�濮嬫椂闂�")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
@Excel(name = "鎶ヨ寮�濮嬫椂闂�", dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date beginTime;
/**
- * 缁熻寮�濮嬫椂闂�
+ * 缁熻缁撴潫鏃堕棿
*/
+ @ApiModelProperty(value = "缁熻缁撴潫鏃堕棿")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鎶ヨ寮�濮嬫椂闂�", dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鎶ヨ缁撴潫鏃堕棿", dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
- /** 妯″瀷缂栫爜 */
+ /**
+ * 妯″瀷缂栫爜
+ */
+ @ApiModelProperty(value = "妯″瀷缂栫爜")
@Excel(name = "妯″瀷缂栫爜")
private String modelCode;
}
--
Gitblit v1.9.3