From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog

---
 src/main/java/org/springblade/modules/discuss/excel/holdExcel.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/discuss/excel/holdExcel.java b/src/main/java/org/springblade/modules/discuss/excel/holdExcel.java
index 1ca2bf4..b79cf39 100644
--- a/src/main/java/org/springblade/modules/discuss/excel/holdExcel.java
+++ b/src/main/java/org/springblade/modules/discuss/excel/holdExcel.java
@@ -53,7 +53,7 @@
 	@ExcelProperty( "是否投票")
 	private String voteFlag;
 
-	@ExcelProperty( "管理公约")
+	@ExcelProperty( "管理规约")
 	private String managementRegulations;
 
 	@ExcelProperty( "议事规则")

--
Gitblit v1.9.3