Merge branch 'master' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/statistic_company_merge.go

@@ -1727,7 +1727,7 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListV2()
 		return
 	}
 	expireRenewalContractTotal = totalEnd
-	expireRenewalContractMoney = int(totalMoney)
+	expireRenewalContractMoney = int(totalMoneyEnd)
 	if contractDataType == "到期合同" {
 		//列表页数据
 		tmpList, err := models.GetIncrementalCompanyMergeListEnd(conditionEnd1, parsEnd1, startSize, pageSize)