From f8a14a1a828bb674019b69d05d94646a37508572 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 22 Dec 2023 16:05:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E6=B5=81=E7=A8=8B-=E7=BC=BA=E5=B0=91=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esRevision/entity/EsRevisionAdvice.java   |  6 +++++
 .../esRevision/entity/ProcessEsRevision.java  | 27 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/EsRevisionAdvice.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/EsRevisionAdvice.java
index e67d6265..4687f29c 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/EsRevisionAdvice.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/EsRevisionAdvice.java
@@ -100,6 +100,12 @@ public class EsRevisionAdvice implements Serializable {
     @ApiModelProperty(value = "1采纳 2部分采纳 3不采纳")
     private String handleAdvice;
 
+    /**
+     * 理由
+     */
+    @ApiModelProperty(value = "理由")
+    private String reason;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
index 93e7aa21..ce7b9a6d 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
@@ -167,6 +167,13 @@ public class ProcessEsRevision implements Serializable {
     @ApiModelProperty(value = "部门联络人")
     private String contactUser;
 
+    /**
+     * 部门联络人主管级领导
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "部门联络人主管级领导")
+    private String contactUserLeader;
+
     /**
      * 会议纪要
      */
@@ -216,6 +223,26 @@ public class ProcessEsRevision implements Serializable {
     @ApiModelProperty(value = "其他起草人上传文件Id")
     private String otherDrafterUploadFileId;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "授权部门")
+    private String authDept;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "发布日期")
+    private String releaseDate;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "实施日期")
+    private String implementDate;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "征求意见截止日期")
+    private Date adviceDeadline;
+
+    @ApiModelProperty(value = "工作组")
+    private String workGroup;
+
     /**
      * 总工程师
      */