Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release

internal/api/group/group.go

@@ -230,7 +230,7 @@ func GetGroupAllMemberList(c *gin.Context) {
 	client := rpc.NewGroupClient(etcdConn)
 	RpcResp, err := client.GetGroupAllMember(context.Background(), req)
 	if err != nil {
-		log.NewError(req.OperationID, "GetGroupAllMember failed ", err.Error(), req.String())
+		log.NewError(req.OperationID, "GetGroupAllMember failed err", err.Error(), req.String())
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
 		return
 	}

pkg/common/db/mongoModel.go

@@ -945,14 +945,14 @@ func (d *DataBases) GetUserFriendWorkMoments(showNumber, pageNumber int32, userI
 }
 
 type SuperGroup struct {
-	GroupID string `bson:"group_id"`
+	GroupID string `bson:"group_id" json:"groupID"`
 	//MemberNumCount int      `bson:"member_num_count"`
-	MemberIDList []string `bson:"member_id_list"`
+	MemberIDList []string `bson:"member_id_list" json:"memberIDList"`
 }
 
 type UserToSuperGroup struct {
-	UserID      string   `bson:"user_id"`
-	GroupIDList []string `bson:"group_id_list"`
+	UserID      string   `bson:"user_id" json:"userID"`
+	GroupIDList []string `bson:"group_id_list" json:"groupIDList"`
 }
 
 func (d *DataBases) CreateSuperGroup(groupID string, initMemberIDList []string, memberNumCount int) error {