From 69155f0115473d6c17bb7441bc1c7b06e05173ef Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 27 八月 2024 10:45:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java b/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
index b867b25..7056983 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
@@ -67,7 +67,11 @@
private String regionName;
- @ApiModelProperty("鎵ф硶鍘熷洜")
+ @ApiModelProperty("鎵ф硶鍐呭")
+ private String enforceContent;
+
+
+ @ApiModelProperty("鎵ф硶涓婚")
private String enforceReason;
@ApiModelProperty("鎵ф硶绫诲瀷")
@@ -102,6 +106,9 @@
@ApiModelProperty("鎵爜鍏ュ満鏃堕棿")
private Date inTime;
+
+ @ApiModelProperty("浼佷笟纭鏃堕棿")
+ private Date confirmTime;
@ApiModelProperty("鎵ф硶闃熷憳浜烘暟")
@@ -195,6 +202,7 @@
private Integer isEva;
+
@ApiModelProperty("璇勪环鎬诲緱鍒�")
private BigDecimal totalScore;
--
Gitblit v1.9.1