Merge remote-tracking branch 'origin/tuoyun' into tuoyun

internal/api/group/group.go

@@ -281,7 +281,7 @@ func CreateGroup(c *gin.Context) {
 }
 
 //  群主或管理员收到的
-func GetGroupApplicationList(c *gin.Context) {
+func GetRecvGroupApplicationList(c *gin.Context) {
 	params := api.GetGroupApplicationListReq{}
 	if err := c.BindJSON(&params); err != nil {
 		log.NewError("0", "BindJSON failed ", err.Error())

internal/api/manage/management_chat.go

@@ -60,10 +60,10 @@ func newUserSendMsgReq(params *ManagementSendMsgReq) *pbChat.SendMsgReq {
 			MsgFrom:          constant.SysMsgType,
 			ContentType:      params.ContentType,
 			Content:          []byte(newContent),
-			ForceList:        params.ForceList,
-			CreateTime:       utils.GetCurrentTimestampByMill(),
-			Options:          options,
-			OfflinePushInfo:  params.OfflinePushInfo,
+			//	ForceList:        params.ForceList,
+			CreateTime:      utils.GetCurrentTimestampByMill(),
+			Options:         options,
+			OfflinePushInfo: params.OfflinePushInfo,
 		},
 	}
 	return &pbData