Browse Source

Merge branch 'fms_2.5' into debug

ziwen 2 years ago
parent
commit
cab0fae6ae
1 changed files with 2 additions and 2 deletions
  1. 2 2
      controller/contract/register.go

+ 2 - 2
controller/contract/register.go

@@ -1730,7 +1730,7 @@ func (rg *RegisterController) Export(c *gin.Context) {
 		}
 	}
 
-	row3Title = append(row3Title, "套餐备注", "开始时间", "到期时间", "2022年合同金额", "金额单位")
+	row3Title = append(row3Title, "套餐备注", "开始时间", "到期时间", "金额单位")
 	if req.ListParam == 0 {
 		row3Title = append(row3Title, "FICC套餐总金额", "权益套餐总金额")
 	}
@@ -1865,7 +1865,7 @@ func (rg *RegisterController) Export(c *gin.Context) {
 		dataRow.AddCell().SetString(v.ServiceRemark)                                     // 套餐备注
 		dataRow.AddCell().SetString(utils.TimeTransferString("2006/01/02", v.StartDate)) // 开始时间
 		dataRow.AddCell().SetString(utils.TimeTransferString("2006/01/02", v.EndDate))   // 到期时间
-		dataRow.AddCell().SetString(fmt.Sprint("¥", v.ContractAmount))                   // 2022年合同金额
+		//dataRow.AddCell().SetString(fmt.Sprint("¥", v.ContractAmount))                   // 2022年合同金额
 		dataRow.AddCell().SetString(v.CurrencyUnit)                                      // 货币单位
 		if ficcAmount != nil {
 			dataRow.AddCell().SetString(fmt.Sprint("¥", ficcAmount.ServiceAmount)) // FICC套餐总金额