From 3e11f3d28421cf9401bb42e68ed49e118e0ce5dc Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期一, 24 六月 2024 16:40:08 +0800
Subject: [PATCH] 用户导入

---
 project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 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 ab80c57..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
@@ -2,12 +2,14 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.project.common.annotation.Excel;
+import com.project.enforce.domain.EnforcePeer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -51,8 +53,12 @@
 	@Excel(name = "鎵�灞炲尯鍩�")
 	@ApiModelProperty("鎵�灞炲尯鍩�")
 	private String regionName;
-	@Excel(name = "鎵ф硶鍘熷洜")
-	@ApiModelProperty("鎵ф硶鍘熷洜")
+
+	@ApiModelProperty("鎵ф硶鍐呭")
+	private String enforceContent;
+
+
+	@ApiModelProperty("鎵ф硶涓婚")
 	private String enforceReason;
 
 	@ApiModelProperty("鎵ф硶绫诲瀷")
@@ -85,6 +91,7 @@
 	private Date planTime;
 
 	@ApiModelProperty("鎵爜鍏ュ満鏃堕棿")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date inTime;
 
 	@Excel(name = "鎵ф硶闃熷憳浜烘暟")
@@ -174,4 +181,11 @@
 	@ApiModelProperty("鎶曡瘔鍐呭")
 	private String complaintReason;
 
+
+	@ApiModelProperty("鍚岃浜烘暟缁�")
+	private List<EnforcePeer> peers;
+
+
+	@ApiModelProperty("璇勪环鏁版嵁")
+	private EnforceEvaluateVo evaluateVo;
 }

--
Gitblit v1.9.1