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/entity/ExamineTemplate.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineTemplate.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineTemplate.java
index 34bac1a..227072e 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineTemplate.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineTemplate.java
@@ -7,10 +7,10 @@
import com.baomidou.mybatisplus.annotation.IdType;
/**
- * 绩效考核标准(ExamineTemplate)表实体类
+ * 绩效考核管理-绩效考核标准(ExamineTemplate)表实体类
*
* @author xurui
- * @since 2022-07-21 10:58:10
+ * @since 2022-08-03 09:50:44
*/
@SuppressWarnings("serial")
@TableName("examine_template")
@@ -77,7 +77,7 @@
public void setMemo(String memo) {
this.memo = memo;
}
-
+ //设定人/外键
private Long setPersonId;
public Long getSetPersonId() {
@@ -87,7 +87,17 @@
public void setSetPersonId(Long setPersonId) {
this.setPersonId = setPersonId;
}
-
+ //设定人名称
+ private String setPersonName;
+
+ public String getSetPersonName() {
+ return setPersonName;
+ }
+
+ public void setSetPersonName(String setPersonName) {
+ this.setPersonName = setPersonName;
+ }
+ //设定人部门ID/外键
private Long setPersonDepartmentId;
public Long getSetPersonDepartmentId() {
--
Gitblit v1.9.2