From c35d9c6311b6f9ef75b49559a5c6db75e0a43ac6 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 30 七月 2024 20:06:50 +0800
Subject: [PATCH] 修改bug&分享

---
 zhang-content/src/main/java/com/ruoyi/domain/Meeting.java |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 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 d945927..706fc24 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
@@ -32,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;
     /**
      * 鐢宠閮ㄩ棬鎴栧搴�
      */
@@ -58,7 +58,7 @@
      * 缁撴潫鏃堕棿
      */
     @Excel(name = "缁撴潫鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
 
@@ -76,13 +76,13 @@
     /**
      * 鏄惁鎽嗘斁姘寸墝
      */
-    @Excel(name = "鏄惁鎽嗘斁姘寸墝")
-    private int isPlacebrand;
+    @Excel(name = "鏄惁鎽嗘斁姘寸墝(1:鏄� 0:鍚�)")
+    private Integer isPlacebrand;
     /**
      * 鑱旂郴浜�
      */
     @Excel(name = "鑱旂郴浜�")
-    private int connPerson;
+    private String connPerson;
     /**
      * 鑱旂郴鐢佃瘽
      */
@@ -91,12 +91,11 @@
     /**
      * 鐘舵��
      */
-    @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;
 
 

--
Gitblit v1.9.1