From b2fd87f84dda13225dde9c3ab1ff56d560a80b44 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期五, 28 六月 2024 22:06:01 +0800
Subject: [PATCH] 修改过滤配偶
---
zhang-content/src/main/java/com/ruoyi/domain/Meeting.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 c1453e2..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,8 +7,10 @@
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;
import java.util.Date;
@Data
@@ -40,7 +42,7 @@
* 鐢宠浜�
*/
@Excel(name = "鐢宠浜�")
- private int applyPerson;
+ private String applyPerson;
/**
* 鐢宠閮ㄩ棬鎴栧搴�
*/
@@ -50,27 +52,27 @@
* 寮�濮嬫椂闂�
*/
@Excel(name = "寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**
* 缁撴潫鏃堕棿
*/
@Excel(name = "缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @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;
/**
* 鏄惁鎽嗘斁姘寸墝
*/
@@ -80,7 +82,7 @@
* 鑱旂郴浜�
*/
@Excel(name = "鑱旂郴浜�")
- private int connPerson;
+ private String connPerson;
/**
* 鑱旂郴鐢佃瘽
*/
@@ -94,7 +96,7 @@
/**
* 鐢熸垚鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
--
Gitblit v1.9.1