From 5703d0e9865df3ba05bb02bc382ce59fbf5f7da0 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 12 八月 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/entity/TargetDivideDetail.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java
index bb4ff67..77f17d2 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java
@@ -1,6 +1,8 @@
package com.gkhy.safePlatform.targetDuty.entity;
import java.sql.Timestamp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.targetDuty.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -10,7 +12,7 @@
* 目标指标分解详情(TargetDivideDetail)表实体类
*
* @author xurui
- * @since 2022-07-20 13:32:39
+ * @since 2022-08-03 09:25:40
*/
@SuppressWarnings("serial")
@TableName("target_divide_detail")
@@ -48,6 +50,7 @@
this.value = value;
}
//制定日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp makeDate;
public Timestamp getMakeDate() {
@@ -87,5 +90,15 @@
public void setCommitPersonId(Long commitPersonId) {
this.commitPersonId = commitPersonId;
}
+ //上报人名称
+ private String commitPersonName;
+
+ public String getCommitPersonName() {
+ return commitPersonName;
+ }
+
+ public void setCommitPersonName(String commitPersonName) {
+ this.commitPersonName = commitPersonName;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2