From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingDetailResponse.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingDetailResponse.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingDetailResponse.java
index eff0b41..46178bd 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingDetailResponse.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingDetailResponse.java
@@ -1,8 +1,9 @@
package com.doumee.dao.web.response;
import com.doumee.dao.business.model.BookingTime;
-import com.doumee.dao.business.model.Multifile;
-import com.doumee.dao.business.model.Projects;
+import com.doumee.dao.system.model.Multifile;
+import com.doumee.dao.system.model.SystemUser;
+import com.doumee.dao.system.vo.UserResponse;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -60,7 +61,9 @@
private String bookingUserName;
@ApiModelProperty(value = "浼氳棰勭害浜轰俊鎭�")
- private UserResponse bookingUser;
+ private SystemUser bookingUser;
+// @ApiModelProperty(value = "浼氳棰勭害浜轰俊鎭�")
+// private UserResponse bookingUser;
@ApiModelProperty(value = "浼氳鐘舵��: 1=鏈紑濮嬶紱2=杩涜涓紱3=宸茬粨鏉�")
private Integer meetingStatus;
@@ -69,7 +72,9 @@
private String remark;
@ApiModelProperty(value = "浼氳瀹ょ鐞嗕汉")
- private UserResponse roomUser;
+ private SystemUser roomUser;
+// @ApiModelProperty(value = "浼氳瀹ょ鐞嗕汉")
+// private UserResponse roomUser;
}
--
Gitblit v1.9.3