Merge branch 'dev_v1.1.40_wh' of BaseService/jyMicroservices into feature/v1.1.40

jyBXSubscribe/api/bxsubscribe.api

@@ -81,7 +81,7 @@ type (
 		EntId           int64                    `header:"entId,optional"`
 		AccountId       int64                    `header:"accountId,optional"`
 		PositionId      int64                    `header:"positionId,optional"`
-		District        string                   `json:"district,optional"`
+		District        map[string]interface{}   `json:"district,optional"`
 	}
 	SetReadReq {
 		AppId        string `header:"appId"`

jyBXSubscribe/api/internal/types/types.go

@@ -73,7 +73,7 @@ type SubscribeUpdateReq struct {
 	EntId           int64                    `header:"entId,optional"`
 	AccountId       int64                    `header:"accountId,optional"`
 	PositionId      int64                    `header:"positionId,optional"`
-	District        string                   `json:"district,optional"`
+	District        map[string]interface{}   `json:"district,optional"`
 }
 
 type SetReadReq struct {