Merge branch 'aj_overseas_custorm' into debug

controllers/overseas_custom/custom.go

@@ -344,7 +344,7 @@ func (this *OverseasCustomController) CustomOverseasLabelSet() {
 			return
 		}
 	} else {
-		companyObj := new(company.Company)
+		companyObj := new(company.CompanyProduct)
 		companyObj.CompanyId = req.CompanyId
 		companyObj.OverseasLabel = req.OverseasLabel
 		updateCols := []string{"OverseasLabel"}

models/company/company.go

@@ -44,7 +44,6 @@ type Company struct {
 	Nation          string    `description:"所属国家"`
 	IsHide          int       `description:"是否隐藏:0:不隐藏,1:隐藏"`
 	OverseasStatus  string    `description:"海外客户状态:'正式','试用','关闭'"`
-	OverseasLabel   int       `description:"海外客户试用子标签：1未分类、2  推进、3 跟踪、4 预备、"`
 }
 
 // 新增客户

models/company/company_product.go

@@ -54,6 +54,7 @@ type CompanyProduct struct {
 	TryOutDayTotal      int       `description:"客户总试用天数"`
 	CloseReason         string    `description:"关闭原因"`
 	CloseTime           time.Time `description:"关闭时间"`
+	OverseasLabel       int       `description:"海外客户试用子标签：1未分类、2  推进、3 跟踪、4 预备、"`
 }
 
 // 新增客户产品

models/overseas_custom/overseas_custom_seller.go

@@ -7,7 +7,7 @@ import (
 
 // 海外客户销售
 type OverseasCustomerSale struct {
-	OverseasCustomSellerId int       `orm:"column(overseas_custorm_seller_id);pk"`
+	OverseasCustomSellerId int       `orm:"column(overseas_custom_seller_id);pk"`
 	SellerId               int       `description:"销售id"`
 	CreateTime             time.Time `description:"创建时间"`
 }