From b1643b619696f2578e22d7f3bcc2cacca63a1ce6 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 26 五月 2024 22:26:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/domain/Meeting.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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..ed6e0f3 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
@@ -42,7 +42,7 @@
* 鐢宠浜�
*/
@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;
@@ -82,7 +82,7 @@
* 鑱旂郴浜�
*/
@Excel(name = "鑱旂郴浜�")
- private int connPerson;
+ private String connPerson;
/**
* 鑱旂郴鐢佃瘽
*/
@@ -96,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