Merge branch 'dev/1.1.25_wh' of BaseService/jyMicroservices into feature/v1.1.25

jyBXSubscribe/api/bxsubscribe.api

@@ -36,8 +36,9 @@ type (
 		PositionType   int64                  `header:"positionType,optional"`
 		NotReturnCount int64                  `json:"notReturnCount,optional"`
 		Item           map[string]interface{} `json:"item,optional"`
+		AccountId      string                 `header:"accountId,optional"`
+		PositionId     string                 `header:"positionId,optional"`
 		MgoUserId      string                 `header:"mgoUserId,optional"` //原userId
-
 	}
 	//
 	someInfoReq {

jyBXSubscribe/api/internal/logic/subscribeListLogic.go

@@ -79,6 +79,8 @@ func (l *SubscribeListLogic) SubscribeList(req *types.SubscribeReq) (resp *types
 		PositionType:   req.PositionType,
 		NotReturnCount: req.NotReturnCount,
 		Item:           matchitems,
+		AccountId:      req.AccountId,
+		PositionId:     req.PositionId,
 		MgoUserId:      req.MgoUserId,
 	})
 	if err != nil {

jyBXSubscribe/api/internal/types/types.go

@@ -28,6 +28,8 @@ type SubscribeReq struct {
 	PositionType   int64                  `header:"positionType,optional"`
 	NotReturnCount int64                  `json:"notReturnCount,optional"`
 	Item           map[string]interface{} `json:"item,optional"`
+	AccountId      string                 `header:"accountId,optional"`
+	PositionId     string                 `header:"positionId,optional"`
 	MgoUserId      string                 `header:"mgoUserId,optional"` //原userId
 }