From dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 十月 2025 15:56:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
index 5e97dc8..4ae6fe8 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
@@ -43,6 +43,7 @@
     private Integer isdeleted;
 
     @ApiModelProperty(value = "澶囨敞")
+    @ExcelColumn(name="浼氳闇�姹�",index = 7,width = 10)
     private String remark;
 
     @ApiModelProperty(value = "浼氳涓婚")

--
Gitblit v1.9.3