From 63240c3b7edb2a149511fdbe4108755ad60db91f Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 19 十一月 2024 15:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/Meeting.java | 5 ++---
1 files changed, 2 insertions(+), 3 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 7a5f4ce..2e817df 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
@@ -76,7 +76,7 @@
/**
* 鏄惁鎽嗘斁姘寸墝
*/
- @Excel(name = "鏄惁鎽嗘斁姘寸墝")
+ @Excel(name = "鏄惁鎽嗘斁姘寸墝(1:鏄� 0:鍚�)")
private Integer isPlacebrand;
/**
* 鑱旂郴浜�
@@ -91,7 +91,6 @@
/**
* 鐘舵��
*/
- @Excel(name = "鐘舵��")
private Integer statu;
/**
* 鐢熸垚鏃堕棿
@@ -100,4 +99,4 @@
private Date createTime;
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1