Merge branch 'fms_2.5'

controller/contract/register.go

@@ -1793,8 +1793,15 @@ func (rg *RegisterController) Export(c *gin.Context) {
 		dataRow.AddCell().SetString(v.ActualPayCompanies)
 		dataRow.AddCell().SetString(v.RelateContractMainCode)
 		dataRow.AddCell().SetString(v.RelateContractCode)
-		dataRow.AddCell().SetString(v.SellerName)
-		dataRow.AddCell().SetString(v.RaiSellerName)
+		if req.ListParam == 0{
+			dataRow.AddCell().SetString(v.SellerName)
+			dataRow.AddCell().SetString(v.RaiSellerName)
+		} else if req.ListParam == 1{
+			dataRow.AddCell().SetString(v.SellerName)
+		} else {
+			dataRow.AddCell().SetString(v.RaiSellerName)
+		}
+
 
 		if req.ListParam != 2 {