From 24d3def5fd8dc526ce9439449d2725b529e394f2 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sun, 22 Sep 2024 13:02:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseSupervise.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseSupervise.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseSupervise.java
index 5db0ec7..dce4065 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseSupervise.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseSupervise.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@@ -42,6 +43,18 @@
private String supContent;
/**
+ * 督办人编号
+ */
+ @TableField(value = "sup_unit_id")
+ private String supUnitId;
+
+ /**
+ * 督办人名称
+ */
+ @TableField(value = "sup_unit_name")
+ private String supUnitName;
+
+ /**
* 督办人编号
*/
@TableField(value = "sup_user_id")
@@ -56,6 +69,7 @@
/**
* 督办时间
*/
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
@TableField(value = "sup_time")
private Date supTime;
@@ -104,8 +118,9 @@
/**
* 回复时间
*/
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
@TableField(value = "reply_time")
- private String replyTime;
+ private Date replyTime;
/**
* 删除状态，0：未删除，1：已删除
@@ -123,12 +138,14 @@
/**
* 创建时间
*/
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
@TableField(value = "create_time")
private Date createTime;
/**
* 更新时间
*/
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
@TableField(value = "update_time")
private Date updateTime;
--
Gitblit v1.8.0