合并冲突解决

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ReservedConferenceVO.java

@@ -1,9 +1,11 @@
 package com.ruoyi.wisdomarbitrate.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 
 /**
  * @author wangqiong
@@ -22,16 +24,12 @@ public class ReservedConferenceVO {
      */
     @NotEmpty(message = "房主id不能为空")
     private String roomId;
-    /**
-     * 会议开始时间
-     */
     @NotNull(message = "会议开始时间不能为空")
-    private Integer scheduleStartTime;
-    /**
-     * 会议结束时间
-     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date scheduleStartTime;
     @NotNull(message = "会议结束时间不能为空")
-    private Integer scheduleEndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date scheduleEndTime;
     @NotNull(message = "案件id不能为空")
     private Long caseId;
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/SendRoomNoMessageVO.java

@@ -1,10 +1,12 @@
 package com.ruoyi.wisdomarbitrate.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @author wangqiong
@@ -18,7 +20,10 @@ public class SendRoomNoMessageVO implements Serializable {
     private Long id;
     @NotEmpty(message = "房间号不能为空")
     private String roomNo;
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date scheduleStartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date scheduleEndTime;
 
 
 }