From ec4733f0c90a88f2266731d16c94e6e2fada7528 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 22 六月 2025 22:46:45 +0800
Subject: [PATCH] 修改
---
zhang-content/src/main/java/com/ruoyi/domain/Meeting.java | 17 ++++++++---------
1 files changed, 8 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 363441a..2e817df 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
@@ -32,12 +32,12 @@
* 鍙绾充汉鏁�
*/
@Excel(name = "鍙绾充汉鏁�")
- private int conPeople;
+ private Integer conPeople;
/**
* 鍙備笌浜烘暟
*/
@Excel(name = "鍙備笌浜烘暟")
- private int partPeople;
+ private Integer partPeople;
/**
* 鐢宠浜�
*/
@@ -58,7 +58,7 @@
* 缁撴潫鏃堕棿
*/
@Excel(name = "缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
@@ -76,8 +76,8 @@
/**
* 鏄惁鎽嗘斁姘寸墝
*/
- @Excel(name = "鏄惁鎽嗘斁姘寸墝")
- private int isPlacebrand;
+ @Excel(name = "鏄惁鎽嗘斁姘寸墝(1:鏄� 0:鍚�)")
+ private Integer isPlacebrand;
/**
* 鑱旂郴浜�
*/
@@ -91,13 +91,12 @@
/**
* 鐘舵��
*/
- @Excel(name = "鐘舵��")
- private int statu;
+ private Integer statu;
/**
* 鐢熸垚鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1