Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev

@@ -51,7 +51,7 @@ type DividendsEstimateMoneyItem struct {
 		DepartmentName string `json:"departmentName"`
 	} `json:"department"` //发起部门
 	CooperationContractSponsorName string `json:"cooperationContractSponsorName"`
-	StageAndUndertaker             struct {
+	StageAndUndertaker             []struct {
 		Stage       int `json:"stage"` // 分红阶段
 		Undertakers []struct {
 			UndertakerId int `json:"undertakerId,string"` // 承接人id

@@ -17,7 +17,7 @@ type CooperationContract struct {
 		DepartmentId     int    `json:"departmentId,string"`
 		DepartmentName   string `json:"departmentName"`
 		DepartmentNumber string `json:"departmentNumber"`
-	} `jsopn:"department" json:"department"` //发起部门
+	} `jsopn:"department"` //发起部门
 	CooperationContractSponsor struct {
 		UserId   int `json:"userId,string"` //id
 		UserInfo struct {

@@ -18,7 +18,7 @@ type (
 			OrderGoodId int `json:"orderGoodId,string"`
 			//	共创合约编号
 			CooperationContractNumber string `json:"cooperationContractNumber"`
-			//	分红订单号或退货单号、
+			//	分红订单号或退货单号
 			OrderNumber string `json:"orderNumber"`
 			//	来源单号
 			OriginalOrderNum string `json:"originalOrderNum"`
@@ -26,12 +26,13 @@ type (
 			CustomerName string `json:"customerName"`
 			//	订单区域
 			RegionName string `json:"region"`
-			//货品名称
+			//  货品名称
 			OrderGoodName string `json:"orderGoodName"`
 			//	订单金额
 			OrderAmount float64 `json:"orderAmount"`
 			//	订单/退货单日期
 			OrderDate time.Time `json:"orderDate"`
+			OrgId     int       `json:"orgId"`
 		} `json:"list"`
 	}
 )
@@ -121,7 +122,7 @@ type (
 				} `json:"department"` //发起部门
 				// 共创合约发起人
 				CooperationContractSponsorName string `json:"cooperationContractSponsor"`
-				StageAndUndertaker             struct {
+				StageAndUndertaker             []struct {
 					Stage       int `json:"stage"` // 分红阶段
 					Undertakers []struct {
 						UndertakerId int `json:"undertakerId,string"` // 承接人id