From d2902daad7261ac7d0148dbb9f33f39e52d433f6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 16 八月 2024 18:15:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
index 2f13912..0f9ed9a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
@@ -4,6 +4,7 @@
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.dao.system.model.Multifile;
import com.doumee.core.model.LoginUserModel;
+import com.doumee.dao.system.model.Multifile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -79,12 +80,11 @@
@ApiModelProperty(value = "澶勭悊鏃堕棿")
@ExcelColumn(name="澶勭悊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date checkDate;
@ApiModelProperty(value = "澶勭悊璇存槑")
@ExcelColumn(name="澶勭悊璇存槑")
- private String checklInfo;
+ private String checkInfo;
@ApiModelProperty(value = "澶勭悊浜虹紪鐮侊紙鍏宠仈member)", example = "1")
@ExcelColumn(name="澶勭悊浜虹紪鐮侊紙鍏宠仈member)")
@@ -122,11 +122,23 @@
@ApiModelProperty(value = "鏌ヨ鎴濮嬫椂闂达紙鍩轰簬鎻愭姤鏃堕棿锛�", example = "2024-05-20 11:48:46")
@TableField(exist = false)
private Date queryEndTime;
+ @ApiModelProperty(value = "鐜板満鎯呭喌鎻愭姤闄勪欢闆嗗悎")
+ @TableField(exist = false)
+ private List<Multifile> submitFileList;
+ @ApiModelProperty(value = "澶勭悊鍓嶉檮浠堕泦鍚�")
+ @TableField(exist = false)
+ private List<Multifile> dealBeforeFileList;
+ @ApiModelProperty(value = "澶勭悊鍚庨檮浠堕泦鍚�")
+ @TableField(exist = false)
+ private List<Multifile> dealAfterFileList;
@ApiModelProperty(value = "鎻愭姤鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date submitTime;
+ @ApiModelProperty(value = "澶勭悊鏃堕棿锛堟暣鏀�/閫�鍥炰娇鐢級")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date dealTime;
@ApiModelProperty(value = "闄勪欢淇℃伅")
@TableField(exist = false)
--
Gitblit v1.9.3