From 5703d0e9865df3ba05bb02bc382ce59fbf5f7da0 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 12 八月 2022 16:59:06 +0800
Subject: [PATCH] Merge branch 'genchuang' of https://sinanoaq.cn:8888/r/safePlatform-out into master

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java
index 192ebe9..c391e9a 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java
@@ -28,8 +28,12 @@
     private String title;
     //提交人ID/外键
     private Long submitPersonId;
+    //提交人名称/外键
+    private String submitPersonName;
     //审批人ID/外键
     private Long approvePersonId;
+    //审批人名称/外键
+    private String approvePersonName;
     //审批状态 1:未审批 2:审批中 3:审批完成
     private Integer approveStatus;
     //审批意见
@@ -43,6 +47,22 @@
     //关联业务说明
     private String relateDesc;
 
+    public String getSubmitPersonName() {
+        return submitPersonName;
+    }
+
+    public void setSubmitPersonName(String submitPersonName) {
+        this.submitPersonName = submitPersonName;
+    }
+
+    public String getApprovePersonName() {
+        return approvePersonName;
+    }
+
+    public void setApprovePersonName(String approvePersonName) {
+        this.approvePersonName = approvePersonName;
+    }
+
     public Long getId() {
         return id;
     }

--
Gitblit v1.9.2