From a69aafe60ce001834b981778f12fd74d4af77e23 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 23 六月 2024 22:04:42 +0800
Subject: [PATCH] 小医生修改&下载分享数据
---
zhang-content/src/main/java/com/ruoyi/domain/Meeting.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
index 4bf2f5a..ed6e0f3 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
@@ -7,6 +7,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
import org.joda.time.DateTime;
import java.sql.Timestamp;
@@ -41,7 +42,7 @@
* 鐢宠浜�
*/
@Excel(name = "鐢宠浜�")
- private int applyPerson;
+ private String applyPerson;
/**
* 鐢宠閮ㄩ棬鎴栧搴�
*/
@@ -51,27 +52,27 @@
* 寮�濮嬫椂闂�
*/
@Excel(name = "寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**
* 缁撴潫鏃堕棿
*/
@Excel(name = "缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private Timestamp endTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
/**
* 寮�濮嬪紑浼氭椂闂�
*/
- @TableField(exist = false)
- private Date happenStartTime;
+ @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
+ private Timestamp happenStartTime;
/**
* 缁撴潫鏃堕棿
*/
- @TableField(exist = false)
- private Date happenEndTime;
+ @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
+ private Timestamp happenEndTime;
/**
* 鏄惁鎽嗘斁姘寸墝
*/
@@ -81,7 +82,7 @@
* 鑱旂郴浜�
*/
@Excel(name = "鑱旂郴浜�")
- private int connPerson;
+ private String connPerson;
/**
* 鑱旂郴鐢佃瘽
*/
@@ -95,8 +96,8 @@
/**
* 鐢熸垚鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private Timestamp createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
}
--
Gitblit v1.9.1