Merge remote-tracking branch 'origin/master'

hs-im-server/im-service/src/main/java/com/lld/im/service/call/model/HistoryListReq.java

@@ -1,13 +1,14 @@
 package com.lld.im.service.call.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.lld.im.common.model.RequestBase;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
+import java.util.Date;
 
 @Data
 public class HistoryListReq extends RequestBase {
-    @NotBlank(message = "用户不能为空")
+
     private String uid;
 
 
@@ -16,4 +17,9 @@ public class HistoryListReq extends RequestBase {
 
     //第几页
     private Integer offset;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private Date startTime;;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private Date endTime;;
 }