From f1ef1f2baf4e58733c4913ce5df0b3d2ea582308 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 12 十一月 2025 16:49:08 +0800
Subject: [PATCH] 修改了一个bug
---
zhang-content/src/main/java/com/ruoyi/domain/Meeting.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 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 aa37835..2e817df 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
@@ -7,7 +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
@@ -29,17 +32,17 @@
* 鍙绾充汉鏁�
*/
@Excel(name = "鍙绾充汉鏁�")
- private int conPeople;
+ private Integer conPeople;
/**
* 鍙備笌浜烘暟
*/
@Excel(name = "鍙備笌浜烘暟")
- private int partPeople;
+ private Integer partPeople;
/**
* 鐢宠浜�
*/
@Excel(name = "鐢宠浜�")
- private int applyPerson;
+ private String applyPerson;
/**
* 鐢宠閮ㄩ棬鎴栧搴�
*/
@@ -49,37 +52,37 @@
* 寮�濮嬫椂闂�
*/
@Excel(name = "寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**
* 缁撴潫鏃堕棿
*/
@Excel(name = "缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @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;
/**
* 鏄惁鎽嗘斁姘寸墝
*/
- @Excel(name = "鏄惁鎽嗘斁姘寸墝")
- private int isPlacebrand;
+ @Excel(name = "鏄惁鎽嗘斁姘寸墝(1:鏄� 0:鍚�)")
+ private Integer isPlacebrand;
/**
* 鑱旂郴浜�
*/
@Excel(name = "鑱旂郴浜�")
- private int connPerson;
+ private String connPerson;
/**
* 鑱旂郴鐢佃瘽
*/
@@ -88,13 +91,12 @@
/**
* 鐘舵��
*/
- @Excel(name = "鐘舵��")
- private int statu;
+ private Integer statu;
/**
* 鐢熸垚鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1