From f6a1bf1d9b19dd8b3750034048f3876d086db1f1 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期三, 14 八月 2024 17:11:49 +0800
Subject: [PATCH] 企业二维码添加

---
 project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java |   20 +++++++++++++++++---
 1 files changed, 17 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..19fd8cd 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,11 +87,16 @@
 
 	@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;
+
+	@ApiModelProperty("浼佷笟纭鏃堕棿")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date confirmTime;
 
 	@Excel(name = "鎵ф硶闃熷憳浜烘暟")
 	@ApiModelProperty("鎵ф硶闃熷憳浜烘暟")
@@ -177,6 +186,11 @@
 	private String complaintReason;
 
 
+
 	@ApiModelProperty("鍚岃浜烘暟缁�")
 	private List<EnforcePeer> peers;
+
+
+	@ApiModelProperty("璇勪环鏁版嵁")
+	private EnforceEvaluateVo evaluateVo;
 }

--
Gitblit v1.9.1