Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java

@@ -135,8 +135,17 @@ public class CaseAffiliate   extends BaseEntity {
 
     /** 送达电子邮件 */
     private String sendEmail;
+    private String userId;
     private String applicantAgentUserId;
 
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
     public String getApplicantAgentUserId() {
         return applicantAgentUserId;
     }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ReservedConference.java

@@ -0,0 +1,40 @@
+package com.ruoyi.wisdomarbitrate.domain;
+
+import lombok.Data;
+
+/**
+ * @author wangqiong
+ * @description 预定会议
+ * @Version 1.0
+ * @date 2023-11-09 16:51
+ */
+@Data
+public class ReservedConference {
+    /**
+     * id
+     */
+    private String id;
+    /**
+     * 案件id
+     */
+    private Long caseId;
+    /**
+     * 房间号
+     */
+    private String roomId;
+    /**
+     * 预定会议开始时间
+     */
+    private String scheduleStartTime;
+    /**
+     * 预定会议结束时间
+     */
+    private String scheduleEndTime;
+
+    public ReservedConference( Long caseId, String roomId, String scheduleStartTime, String scheduleEndTime) {
+        this.caseId = caseId;
+        this.roomId = roomId;
+        this.scheduleStartTime = scheduleStartTime;
+        this.scheduleEndTime = scheduleEndTime;
+    }
+}