From 3680d8f2d54dcd3ac62fcf9730e3c5e82e1714c8 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 29 九月 2025 17:07:43 +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, 5 insertions(+), 4 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 938879a..91650b4 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,6 +1,7 @@
package com.doumee.dao.business.model;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -18,7 +19,7 @@
@Data
@ApiModel("鎶ヨ瑙勫垯閰嶇疆鏄庣粏琛�")
@TableName("`warning_rule_detail`")
-public class WarningRuleDetail {
+public class WarningRuleDetail extends LoginUserModel {
@ApiModelProperty(value = "涓婚敭", example = "1")
@ExcelColumn(name="涓婚敭")
@@ -58,9 +59,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="鎺掑簭鐮�")
--
Gitblit v1.9.3