Merge remote-tracking branch 'origin/feature/v4.9.87' into feature/v4.9.87

# Conflicts:
#	src/jfw/modules/subscribepay/src/go.mod

src/jfw/modules/subscribepay/src/entity/dataExportPackStruct.go

@@ -377,8 +377,8 @@ func (this *dataExportPackStruct) DoEntPackRepeatCheck(sess *httpsession.Session
 		exportLock.Unlock()
 		entLock.Lock()
 		//开始去重
-		_, newCount, _ := dataexport.GetEntDataExportCount(util.MQFW, util.Mgo_bidding, config.Config.Mongobidding.DbName, config.Config.Elasticsearch,
-			selectId, entIdInt, entUserId, true, middleGround.JyApiConfig.ApiList.EntDedupUrl, config.ExConf.MsgMaxCount)
+		_, newCount, err := dataexport.GetEntDataExportCountIdArr(util.MQFW, util.Mgo_bidding, config.Config.Mongobidding.DbName, config.Config.Elasticsearch,
+			selectId, entIdInt, entUserId, middleGround.JyApiConfig.ApiList.EntDedupUrl, config.ExConf.MsgMaxCount)
 		entLock.Unlock()
 		return newCount, err
 	}