From 92d9a112e492720ee610fbb46e1ed1d6f0a86fee Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 十二月 2025 14:57:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java
index 62c7d9b..5f6c9c2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java
@@ -72,6 +72,12 @@
     @ExcelColumn(name="鎵�鍦ㄤ綅缃�",width=10,index = 5)
     private String region;
 
+    @ApiModelProperty(value = "浣嶇疆涓婚敭")
+    private String regionId;
+
+    @ApiModelProperty(value = "璁惧涓婚敭")
+    private String deviceId;
+
     @ApiModelProperty(value = "鍞竴鏍囪瘑")
     //@ExcelColumn(name="鍞竴鏍囪瘑")
     private String eventId;

--
Gitblit v1.9.3