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

@@ -94,7 +94,7 @@ func (dividendsEstimateService *DividendsEstimateService) SearchDividendsEstimat
 			OrderOrReturnedOrderNum:      v.OrderOrReturnedOrderNum,
 			CooperationProjectNumber:     v.CooperationProjectNumber,
 			CooperationContractNumber:    v.CooperationContractNumber,
-			DividendsIncentivesStage:     v.DividendsIncentivesStage,
+			DividendsIncentivesStage:     v.DividendsStage,
 			IsCanceled:                   v.IsCanceled,
 		}
 		item.DividendsUser.Phone = v.DividendsUser.UserPhone
@@ -185,7 +185,7 @@ func (dividendsEmmateService *DividendsEstimateService) MoneyIncentivesSelector(
 		ruleStage := []int{}
 		for _, vv := range resultDividendsEstimate.Grid.List {
 			if v.UserId == vv.DividendsUser.UserId {
-				ruleStage = append(ruleStage, vv.DividendsIncentivesStage)
+				ruleStage = append(ruleStage, vv.DividendsStage)
 			}
 		}
 		temp := dto.ContractUndertaker{

@@ -64,7 +64,7 @@ type (
 				OrderOrReturnedOrderNum      string    `json:"orderOrReturnedOrderNum"`      // 分红订单号或退货单号
 				CooperationProjectNumber     string    `json:"cooperationProjectNumber"`     // 共创项目编号，
 				CooperationContractNumber    string    `json:"cooperationContractNumber"`    // 共创项目合约编号，
-				DividendsIncentivesStage     int       `json:"DividendsIncentivesStage"`     // 分红阶段
+				DividendsStage               int       `json:"DividendsStage"`               // 分红阶段
 				IsCanceled                   bool      `json:"isCanceled"`                   // 取消状态
 				DividendsUser                struct {
 					UserId     int    `json:"userId,string,"`     // 用户ID，