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/RewardPunishmentDetail.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/RewardPunishmentDetail.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/RewardPunishmentDetail.java
index e3709ec..eb5a5ec 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/RewardPunishmentDetail.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/RewardPunishmentDetail.java
@@ -10,7 +10,7 @@
* 奖惩记录(RewardPunishmentDetail)表实体类
*
* @author xurui
- * @since 2022-07-27 15:37:45
+ * @since 2022-08-03 10:37:54
*/
@SuppressWarnings("serial")
@TableName("reward_punishment_detail")
@@ -37,7 +37,7 @@
public void setRewardPunishmentStandardId(Long rewardPunishmentStandardId) {
this.rewardPunishmentStandardId = rewardPunishmentStandardId;
}
- //员工（多个用逗号隔开）
+ //员工ID（多个用逗号隔开）
private String personId;
public String getPersonId() {
@@ -47,6 +47,16 @@
public void setPersonId(String personId) {
this.personId = personId;
}
+ //员工名（多个用逗号隔开）
+ private String personName;
+
+ public String getPersonName() {
+ return personName;
+ }
+
+ public void setPersonName(String personName) {
+ this.personName = personName;
+ }
//备注信息
private String memo;
--
Gitblit v1.9.2