From 759bbb8ee99665382a689fa90277a9b2279238da Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 19 八月 2022 19:04:02 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java | 55 +++++++------------------------------------------------
1 files changed, 7 insertions(+), 48 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java
index f9cbda8..069c1a2 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java
@@ -11,7 +11,7 @@
* 安全目标考核(TargetExamine)表实体类
*
* @author xurui
- * @since 2022-08-12 08:07:53
+ * @since 2022-08-18 16:27:12
*/
@SuppressWarnings("serial")
@TableName("target_examine")
@@ -28,56 +28,15 @@
this.id = id;
}
- //关联的目标指标/外键
- private Long targetId;
+ //关联的目标分解/外键
+ private Long targetDivideDetailId;
- public Long getTargetId() {
- return targetId;
+ public Long getTargetDivideDetailId() {
+ return targetDivideDetailId;
}
- public void setTargetId(Long targetId) {
- this.targetId = targetId;
- }
- //责任部门id/外键
- private Long dutyDepartmentId;
-
- public Long getDutyDepartmentId() {
- return dutyDepartmentId;
- }
-
- public void setDutyDepartmentId(Long dutyDepartmentId) {
- this.dutyDepartmentId = dutyDepartmentId;
- }
- //考核指标
- private String examineValue;
-
- public String getExamineValue() {
- return examineValue;
- }
-
- public void setExamineValue(String examineValue) {
- this.examineValue = examineValue;
- }
- //制定部门id/外键
- private Long makerDepartmentId;
-
- public Long getMakerDepartmentId() {
- return makerDepartmentId;
- }
-
- public void setMakerDepartmentId(Long makerDepartmentId) {
- this.makerDepartmentId = makerDepartmentId;
- }
- //制定日期
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Timestamp makeDate;
-
- public Timestamp getMakeDate() {
- return makeDate;
- }
-
- public void setMakeDate(Timestamp makeDate) {
- this.makeDate = makeDate;
+ public void setTargetDivideDetailId(Long targetDivideDetailId) {
+ this.targetDivideDetailId = targetDivideDetailId;
}
//上报值
private String uploadValue;
--
Gitblit v1.9.2