From 0b8838c8dd02161c5e7577162d8cd3318d133b68 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 16 十二月 2025 17:02:13 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java |    3 +++
 1 files changed, 3 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 612982b..6eacb96 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
@@ -84,6 +84,9 @@
     @ApiModelProperty(value = "鐩戞帶鐐逛富閿�")
     @ExcelColumn(name="鐩戞帶鐐逛富閿�")
     private String deviceId;
+    @ApiModelProperty(value = "鍏宠仈璁惧绫诲瀷 0-鐩戞帶鐐� 1-娑堥槻璁惧 2-娑堥槻浼犳劅鍣�")
+    @ExcelColumn(name="鍏宠仈璁惧绫诲瀷 0-鐩戞帶鐐� 1-娑堥槻璁惧 2-娑堥槻浼犳劅鍣�")
+    private Integer deviceType;
 
     @ApiModelProperty(value = "鍛婅绫诲瀷缂栫爜")
     @TableField(exist = false)

--
Gitblit v1.9.3