From 83c7cfa4ecd5d59106b09efff26be43141e38386 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 十二月 2023 09:10:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java
index 262cccf..9714634 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java
@@ -36,8 +36,10 @@
@ApiModelProperty(value = "浜嬩欢鍞竴鏍囪瘑锛屽悓涓�浜嬩欢鑻ヤ笂鎶ュ娆★紝鍒欎笂鎶ヤ簨浠剁殑eventId鐩稿悓")
private String eventId;
- @ApiModelProperty(value = "浜嬩欢绫诲瀷")
- private String eventType;
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷 -- 197163,浜鸿劯璁よ瘉澶辫触 ; 196893,浜鸿劯璁よ瘉閫氳繃")
+ private Integer eventType;
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷鍚嶇О")
+ private String eventTypeName;
@ApiModelProperty(value = "浜嬩欢婧愮被鍨嬶紝濡傗�渁csDevice鈥�")
private String srcType;
@@ -48,9 +50,11 @@
@ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
private String srcIndex;
- @ApiModelProperty(value = "闂ㄧ鍚嶇О")
- @ExcelColumn(name="闂ㄧ鍚嶇О")
+ @ApiModelProperty(value = "闂ㄧ鐐瑰悕绉�")
private String srcName;
+
+ @ApiModelProperty(value = "闂ㄧ鍚嶇О")
+ private String devName;
@ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
private Integer status;
@@ -191,4 +195,6 @@
@ApiModelProperty(value = "閫氶亾鎬婚�氳浜烘暟")
private Integer totalTimes;
+ @ApiModelProperty(value = "鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
+ private String srcParentIndex;
}
--
Gitblit v1.9.3