From b1740c80205d9584738b1150f4122784c70bbe57 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 08 四月 2025 14:55:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java
index ad11b15..e8b044b 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java
@@ -1,5 +1,6 @@
package com.doumee.dao.web.request;
+import com.doumee.service.business.third.model.LoginUserModel;
import com.doumee.dao.business.model.BookingTime;
import com.doumee.dao.system.model.Multifile;
import com.doumee.dao.business.model.ProjectRel;
@@ -19,7 +20,7 @@
*/
@Data
@ApiModel("浼氳瀹ら瀹氳姹傜被")
-public class BookingsRequest {
+public class BookingsRequest extends LoginUserModel {
@ApiModelProperty(value = "涓婚敭", example = "1")
private Integer id;
@@ -38,7 +39,8 @@
@ApiModelProperty(value = "鍏宠仈浼氳瀹や富閿�", example = "1")
private Integer roomId;
-
+ @ApiModelProperty(value = "鏄惁鍙戦�佸弬浼氫汉閫氱煡锛�0=閫氱煡锛�1=涓嶉�氱煡")
+ private Integer joinNotice;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
--
Gitblit v1.9.3