From def329ac7a0215b6650d3aeccc7ca7d2fca62e5a Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期六, 22 六月 2024 09:44:38 +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 ab80c57..0472f38 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("鎵ф硶绫诲瀷")
@@ -81,7 +87,7 @@
 
 	@Excel(name = "璁″垝鎵ф硶鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
 	@ApiModelProperty("璁″垝鎵ф硶鏃堕棿")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
 	private Date planTime;
 
 	@ApiModelProperty("鎵爜鍏ュ満鏃堕棿")
@@ -174,4 +180,7 @@
 	@ApiModelProperty("鎶曡瘔鍐呭")
 	private String complaintReason;
 
+
+	@ApiModelProperty("鍚岃浜烘暟缁�")
+	private List<EnforcePeer> peers;
 }

--
Gitblit v1.9.1