From 82213e51f923c464e0eea652ace934a0aa26fac9 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 02 十二月 2025 10:04:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/maanshan' into maanshan
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 84ed096..5a23f29 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
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
//@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -126,8 +126,14 @@
@ExcelColumn(name="浜嬩欢绛夌骇",valueMapping = "0=浣�;1=涓�;2=楂�;",width=10,index = 4)
@TableField(exist = false)
private Integer warningLevel;
+ @ApiModelProperty(value = "浜嬩欢缂栫爜")
+ @TableField(exist = false)
+ private String warningCode;
+ @ApiModelProperty(value = "鍒涘缓浜哄悕绉�")
+ @TableField(exist = false)
+ private String createUserName;
@ApiModelProperty(value = "鏌ヨ鏃堕棿寮�濮� ")
@TableField(exist = false)
--
Gitblit v1.9.3