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/chatrg/entity/Chatgroup.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/chatrg/entity/Chatgroup.java b/src/main/java/org/springblade/modules/chatrg/entity/Chatgroup.java
index 990af34..0abebbc 100644
--- a/src/main/java/org/springblade/modules/chatrg/entity/Chatgroup.java
+++ b/src/main/java/org/springblade/modules/chatrg/entity/Chatgroup.java
@@ -59,13 +59,18 @@
*/
@ApiModelProperty(value = "群介绍")
@TableField("GroupContent")
- private String groupcontent;
- /**
- * 群主id
+ private String groupcontent;/**
+ * 群介绍
*/
- @ApiModelProperty(value = "群主id")
- @TableField("GroupId")
- private String groupid;
+ @ApiModelProperty(value = "群公告")
+ @TableField("GroupNotice")
+ private String groupnotice;
+// /**
+// * 群主id
+// */
+// @ApiModelProperty(value = "群主id")
+// @TableField("GroupId")
+// private String groupid;
/**
* 群成员id
*/
--
Gitblit v1.9.3