From 81695c67562b55493a2e98263223c5440e28feed Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 03 八月 2022 14:18:58 +0800
Subject: [PATCH] 合并fix

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

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java
index 753f8d3..63eac78 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java
@@ -52,6 +52,8 @@
     private Timestamp nextTakecareDate;
     //负责人ID外键    
     private Long leadingPersonId;
+    //负责人名称
+    private String leadingPersonName;
     //负责人部门外键    
     private Long leadingPersonDepartmentId;
     //供应商    
@@ -90,6 +92,8 @@
     private Timestamp actualStopDate;
     //停用提交人/外键    
     private Long stopSubmitPersonId;
+    //停用提交人名称
+    private String stopSubmitPersonName;
     //停用提交日期    
     private Timestamp stopSubmitDate;
     //恢复理由    
@@ -145,6 +149,22 @@
     //要删除的检查标准
     private String delCheckStandardeDetails;
 
+    public String getLeadingPersonName() {
+        return leadingPersonName;
+    }
+
+    public void setLeadingPersonName(String leadingPersonName) {
+        this.leadingPersonName = leadingPersonName;
+    }
+
+    public String getStopSubmitPersonName() {
+        return stopSubmitPersonName;
+    }
+
+    public void setStopSubmitPersonName(String stopSubmitPersonName) {
+        this.stopSubmitPersonName = stopSubmitPersonName;
+    }
+
     public String getDelTakecareDetails() {
         return delTakecareDetails;
     }

--
Gitblit v1.9.2