Merge branch 'dev/2.4_rai_new' into debug

controller/contract/register.go

@@ -822,6 +822,12 @@ func (rg *RegisterController) Detail(c *gin.Context) {
 		resp.FailData("获取失败", "获取合同登记详情失败, Err:"+e.Error(), c)
 		return
 	}
+
+	item.SellerIds = strconv.Itoa(item.SellerId)
+	if item.RaiSellerId != 0 {
+		item.SellerIds += ","+strconv.Itoa(item.RaiSellerId)
+	}
+	item.SellerIds = strings.Trim(item.SellerIds, ",")
 	result.ContractRegisterItem = item
 
 	// 套餐信息

models/fms/contract_register.go

@@ -139,6 +139,7 @@ type ContractRegisterItem struct {
 	NewCompany         int     `json:"new_company" description:"是否为新客户: 0-否; 1-是"`
 	ActualPayCompanies string  `json:"actual_pay_companies" description:"合同关联的所有代付方名称, 英文逗号拼接"`
 	CreateTime         string  `json:"create_time" description:"登记时间"`
+	SellerIds          string  `json:"seller_ids"`
 }
 
 // ContractRegisterList 合同登记列表