From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/chatrgc/entity/Chatgroupc.java |   71 +++++++++++++++++++----------------
 1 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/src/main/java/org/springblade/modules/chatrgc/entity/Chatgroupc.java b/src/main/java/org/springblade/modules/chatrgc/entity/Chatgroupc.java
index 82ec5cd..ed7d462 100644
--- a/src/main/java/org/springblade/modules/chatrgc/entity/Chatgroupc.java
+++ b/src/main/java/org/springblade/modules/chatrgc/entity/Chatgroupc.java
@@ -19,12 +19,17 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 聊天记录表实体类
@@ -40,46 +45,48 @@
 	private static final long serialVersionUID = 1L;
 
 	/**
-	* 主键
-	*/
-		@ApiModelProperty(value = "主键")
-		@TableId(value = "id", type = IdType.AUTO)
+	 * 主键
+	 */
+	@ApiModelProperty(value = "主键")
+	@TableId(value = "id", type = IdType.AUTO)
 	private Long id;
 	/**
-	* 发送消息内容
-	*/
-		@ApiModelProperty(value = "发送消息内容")
-		private String postMessage;
+	 * 发送消息内容
+	 */
+	@ApiModelProperty(value = "发送消息内容")
+	private String postMessage;
 	/**
-	* 消息类型 0 文本  1 表情  2 图片  3 视频...
-	*/
-		@ApiModelProperty(value = "消息类型 0 文本  1 表情  2 图片  3 视频...")
-		private Boolean messageType;
+	 * 消息类型 0 文本  1 表情  2 图片  3 视频...
+	 */
+	@ApiModelProperty(value = "消息类型 0 文本  1 表情  2 图片  3 视频...")
+	private Integer messageType;
 	/**
-	* 接收状态 0 已接收  1 未接收
-	*/
-		@ApiModelProperty(value = "接收状态 0 已接收  1 未接收")
-		private Boolean status;
+	 * 接收状态 0 已接收  1 未接收
+	 */
+	@ApiModelProperty(value = "接收状态 0 已接收  1 未接收")
+	private Integer status;
 	/**
-	* 发送时间
-	*/
-		@ApiModelProperty(value = "发送时间")
-		private LocalDateTime postTime;
+	 * 发送时间
+	 */
+	@ApiModelProperty(value = "发送时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date postTime;
 	/**
-	* 群主id
-	*/
-		@ApiModelProperty(value = "群主id")
-		private Long groupId;
+	 * 群主id
+	 */
+	@ApiModelProperty(value = "群主id")
+	private Long groupId;
 	/**
-	* 发送人id
-	*/
-		@ApiModelProperty(value = "发送人id")
-		private Long senderId;
+	 * 发送人id
+	 */
+	@ApiModelProperty(value = "发送人id")
+	private Long senderId;
 	/**
-	* 群id
-	*/
-		@ApiModelProperty(value = "群id")
-		private Integer gid;
+	 * 群id
+	 */
+	@ApiModelProperty(value = "群id")
+	private Long gid;
 
 
 }

--
Gitblit v1.9.3