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/ExamineMng.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java
index ee1c23c..fa211c7 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java
@@ -7,10 +7,10 @@
import com.baomidou.mybatisplus.annotation.IdType;
/**
- * 安全考核管理(ExamineMng)表实体类
+ * 绩效考核管理-安全考核管理(ExamineMng)表实体类
*
* @author xurui
- * @since 2022-07-21 13:43:08
+ * @since 2022-08-03 10:05:37
*/
@SuppressWarnings("serial")
@TableName("examine_mng")
@@ -88,14 +88,24 @@
this.memo = memo;
}
//考核人ID/外键
- private String examinePersonId;
+ private Long examinePersonId;
- public String getExaminePersonId() {
+ public Long getExaminePersonId() {
return examinePersonId;
}
- public void setExaminePersonId(String examinePersonId) {
+ public void setExaminePersonId(Long examinePersonId) {
this.examinePersonId = examinePersonId;
+ }
+ //考核人名称
+ private String examinePersonName;
+
+ public String getExaminePersonName() {
+ return examinePersonName;
+ }
+
+ public void setExaminePersonName(String examinePersonName) {
+ this.examinePersonName = examinePersonName;
}
//被考核人ID/外键（可能有多个，用逗号隔开）
private String beExaminedPersonId;
@@ -107,7 +117,17 @@
public void setBeExaminedPersonId(String beExaminedPersonId) {
this.beExaminedPersonId = beExaminedPersonId;
}
- //考核部门ID/外键
+ //被考核人名称
+ private String beExaminedPersonName;
+
+ public String getBeExaminedPersonName() {
+ return beExaminedPersonName;
+ }
+
+ public void setBeExaminedPersonName(String beExaminedPersonName) {
+ this.beExaminedPersonName = beExaminedPersonName;
+ }
+ //考核部门ID/外键（可能有多个，用逗号隔开）
private Long examineDepartmentId;
public Long getExamineDepartmentId() {
--
Gitblit v1.9.2