From 5703d0e9865df3ba05bb02bc382ce59fbf5f7da0 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Fri, 12 Aug 2022 16:59:06 +0800
Subject: [PATCH] Merge branch 'genchuang' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/RewardPunishmentDetailDto.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/RewardPunishmentDetailDto.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/RewardPunishmentDetailDto.java
index 8d94843..0730615 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/RewardPunishmentDetailDto.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/RewardPunishmentDetailDto.java
@@ -13,6 +13,8 @@
private Long id;
//奖惩标准/外键
private Long rewardPunishmentStandardId;
+ //奖惩标准名称
+ private String rewardPunishmentStandardName;
//员工（多个用逗号隔开）
private String personId;
//被奖惩者
@@ -70,6 +72,17 @@
this.id = id;
}
+ //备注信息
+ private String memo;
+
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+
public Long getRewardPunishmentStandardId() {
return rewardPunishmentStandardId;
}
@@ -101,4 +114,12 @@
public void setCreateTime(Timestamp createTime) {
this.createTime = createTime;
}
+
+ public void setRewardPunishmentStandardName(String rewardPunishmentStandardName) {
+ this.rewardPunishmentStandardName = rewardPunishmentStandardName;
+ }
+
+ public String getRewardPunishmentStandardName() {
+ return rewardPunishmentStandardName;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2