Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

 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
   */