From a1647a5152e3d368ec2fb738ca7cc858e220d06c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 24 九月 2024 09:15:08 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

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

diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.java
index 7fdf791..eb6c94e 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.java
@@ -59,8 +59,8 @@
     @ExcelColumn(name="寮�鏀惧紑濮嬫椂闂�")
     private String startTime;
 
-    @ApiModelProperty(value = "寮�鍙戠粨鏉熸椂闂�")
-    @ExcelColumn(name="寮�鍙戠粨鏉熸椂闂�")
+    @ApiModelProperty(value = "寮�鏀剧粨鏉熸椂闂�")
+    @ExcelColumn(name="寮�鏀剧粨鏉熸椂闂�")
     private String endTime;
 
     @ApiModelProperty(value = "鐘舵�� 0鍙�� 1涓嶅彲閫� ", example = "1")

--
Gitblit v1.9.3