From 01a9bdffee1f04561b3b59406cbb7a76474c55f3 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 十二月 2025 10:59:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java
index 9651da0..612982b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java
@@ -77,11 +77,20 @@
@ExcelColumn(name="鍖哄煙涓婚敭")
private String regionId;
+ @ApiModelProperty(value = "鐩戞帶鐐瑰悕绉�")
+ @ExcelColumn(name="鐩戞帶鐐瑰悕绉�")
+ private String deviceName;
+ @ApiModelProperty(value = "鐩戞帶鐐逛富閿�")
+ @ExcelColumn(name="鐩戞帶鐐逛富閿�")
+ private String deviceId;
@ApiModelProperty(value = "鍛婅绫诲瀷缂栫爜")
@TableField(exist = false)
private String code;
+ @ApiModelProperty(value = "鍛婅鍚嶇О")
+ @TableField(exist = false)
+ private String warningName;
}
--
Gitblit v1.9.3