From 42eafe650bb4b4084be2059dbbbbc10b3b81c7c7 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Wed, 27 Jul 2022 17:12:49 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/RewardPunishmentDetail.java | 4 ++--
1 files changed, 2 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 8888665..e3709ec 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-21 10:15:45
+ * @since 2022-07-27 15:37:45
*/
@SuppressWarnings("serial")
@TableName("reward_punishment_detail")
@@ -27,7 +27,7 @@
this.id = id;
}
- //奖惩类型 1:奖励 2:惩罚
+ //奖惩标准/外键
private Long rewardPunishmentStandardId;
public Long getRewardPunishmentStandardId() {
--
Gitblit v1.9.2