From cb13c23829768b94ab980635a4f1ce5e48457be4 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 25 六月 2024 16:53:56 +0800
Subject: [PATCH] 用户类型修改

---
 project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
index ec14fbc..0f55ef1 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
@@ -53,8 +53,12 @@
 	@Excel(name = "鎵�灞炲尯鍩�")
 	@ApiModelProperty("鎵�灞炲尯鍩�")
 	private String regionName;
-	@Excel(name = "鎵ф硶鍘熷洜")
-	@ApiModelProperty("鎵ф硶鍘熷洜")
+
+	@ApiModelProperty("鎵ф硶鍐呭")
+	private String enforceContent;
+
+
+	@ApiModelProperty("鎵ф硶涓婚")
 	private String enforceReason;
 
 	@ApiModelProperty("鎵ф硶绫诲瀷")
@@ -83,10 +87,11 @@
 
 	@Excel(name = "璁″垝鎵ф硶鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
 	@ApiModelProperty("璁″垝鎵ф硶鏃堕棿")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date planTime;
 
 	@ApiModelProperty("鎵爜鍏ュ満鏃堕棿")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date inTime;
 
 	@Excel(name = "鎵ф硶闃熷憳浜烘暟")
@@ -179,4 +184,8 @@
 
 	@ApiModelProperty("鍚岃浜烘暟缁�")
 	private List<EnforcePeer> peers;
+
+
+	@ApiModelProperty("璇勪环鏁版嵁")
+	private EnforceEvaluateVo evaluateVo;
 }

--
Gitblit v1.9.1