From 81695c67562b55493a2e98263223c5440e28feed Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 03 八月 2022 14:18:58 +0800
Subject: [PATCH] 合并fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/ExamineTemplateDto.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/ExamineTemplateDto.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/ExamineTemplateDto.java
index 6b5657b..e121e11 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/ExamineTemplateDto.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/ExamineTemplateDto.java
@@ -21,9 +21,11 @@
private String memo;
//设定人/外键
private Long setPersonId;
+ //设定人名称
+ private Long setPersonName;
//设定部门ID/外键
private Long setPersonDepartmentId;
- //设定部门名称/外键
+ //设定部门名称
private String setPersonDepartmentName;
private Timestamp setTimem;
@@ -137,4 +139,12 @@
public void setUpdateTime(Timestamp updateTime) {
this.updateTime = updateTime;
}
+
+ public Long getSetPersonName() {
+ return setPersonName;
+ }
+
+ public void setSetPersonName(Long setPersonName) {
+ this.setPersonName = setPersonName;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2