From 917c4ee8b05e816602aa06f67f2f5447150b242f Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 17 十二月 2025 09:35:50 +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/WarningRule.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRule.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRule.java
index c1e2b0e..03eda6c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRule.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRule.java
@@ -70,6 +70,10 @@
@ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
@ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
private Integer status;
+ @ApiModelProperty(value = "鏄惁浜哄憳閫氱煡 0鍚� 1鏄�", example = "1")
+ private Integer memberNotice;
+ @ApiModelProperty(value = "鏄惁骞挎挱閫氱煡 0鍚� 1鏄�", example = "1")
+ private Integer deviceNotice;
@ApiModelProperty(value = "鎶ヨ绫诲瀷缂栫爜(鍏宠仈warning锛�", example = "1")
@ExcelColumn(name="鎶ヨ绫诲瀷缂栫爜(鍏宠仈warning锛�")
@@ -77,6 +81,15 @@
@ApiModelProperty(value = "閫氱煡浜哄憳-閮ㄩ棬闆嗗悎锛屽涓嫳鏂囧垎鍙烽殧寮�", example = "1")
private String memberNames;
+
+
+ @ApiModelProperty(value = "骞挎挱缂栫爜闆嗗悎锛堝叧鑱攄evice)锛屽涓嫳鏂囬�楀彿闅斿紑", example = "1")
+ private String deviceIds;
+ @ApiModelProperty(value = "骞挎挱鍚嶇О闆嗗悎锛屽涓嫳鏂囧垎鍙烽殧寮�", example = "1")
+ private String deviceNames;
+ @ApiModelProperty(value = "骞挎挱鎾姤鍐呭", example = "1")
+ private String deviceNoticeContent;
+
@ApiModelProperty(value = "浜哄憳閮ㄩ棬", example = "1")
@TableField(exist = false)
private String companyName;
--
Gitblit v1.9.3