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 | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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 09d8952..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
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
@@ -22,6 +23,7 @@
public class WarningRuleDetail extends LoginUserModel {
@ApiModelProperty(value = "涓婚敭", example = "1")
+ @TableId(type = IdType.AUTO)
@ExcelColumn(name="涓婚敭")
private Integer id;
@@ -59,9 +61,9 @@
@ExcelColumn(name="鎶ヨ绫诲瀷缂栫爜(鍏宠仈warning锛�")
private Integer warningId;
- @ApiModelProperty(value = "澶氳鍒欓棿闅旀椂闂�(绉掞級", example = "1")
- @ExcelColumn(name="澶氳鍒欓棿闅旀椂闂�(绉掞級")
- private Integer regionCode;
+ @ApiModelProperty(value = "鍖哄煙缂栫爜", example = "1")
+ @ExcelColumn(name="鍖哄煙缂栫爜")
+ private String regionCode;
@ApiModelProperty(value = "鎺掑簭鐮�")
@ExcelColumn(name="鎺掑簭鐮�")
@@ -75,4 +77,23 @@
@ExcelColumn(name="鍖哄煙涓婚敭")
private String regionId;
+ @ApiModelProperty(value = "鐩戞帶鐐瑰悕绉�")
+ @ExcelColumn(name="鐩戞帶鐐瑰悕绉�")
+ private String deviceName;
+
+ @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)
+ private String code;
+ @ApiModelProperty(value = "鍛婅鍚嶇О")
+ @TableField(exist = false)
+ private String warningName;
+
+
}
--
Gitblit v1.9.3