Merge branch 'feature/eta2.3.4_business_user' into debug

controllers/eta_business/eta_business.go

@@ -327,10 +327,10 @@ func (this *EtaBusinessController) Add() {
 		br.Msg = "研究团队规模不可为空"
 		return
 	}
-	if req.UserMax <= 0 {
+	/*if req.UserMax <= 0 {
 		br.Msg = "用户上限不可小于0"
 		return
-	}
+	}*/
 	req.CapitalScale = strings.TrimSpace(req.CapitalScale)
 
 	// 如果仅校验不新增, 那么不做第二页签约时间的校验(已废弃, 20230919签约时间非必填)
@@ -438,7 +438,7 @@ func (this *EtaBusinessController) Add() {
 	businessItem.IndustryName = req.IndustryName
 	businessItem.CapitalScale = req.CapitalScale
 	businessItem.ResearchTeamSize = req.ResearchTeamSize
-	businessItem.UserMax = req.UserMax
+	//businessItem.UserMax = req.UserMax
 	businessItem.Enable = 1
 	businessItem.SigningStatus = status
 	businessItem.SigningTime = signTime
@@ -548,10 +548,10 @@ func (this *EtaBusinessController) Edit() {
 		br.Msg = "研究团队规模不可为空"
 		return
 	}
-	if req.UserMax <= 0 {
+	/*if req.UserMax <= 0 {
 		br.Msg = "用户上限不可小于0"
 		return
-	}
+	}*/
 	req.CapitalScale = strings.TrimSpace(req.CapitalScale)
 
 	// 权限校验
@@ -585,11 +585,11 @@ func (this *EtaBusinessController) Edit() {
 	item.IndustryName = req.IndustryName
 	item.CapitalScale = req.CapitalScale
 	item.ResearchTeamSize = req.ResearchTeamSize
-	item.UserMax = req.UserMax
+	//item.UserMax = req.UserMax
 	item.Nation = req.Nation
 	item.ModifyTime = time.Now().Local()
 	cols := []string{
-		"Province", "City", "Address", "Leader", "IndustryId", "IndustryName", "CapitalScale", "ResearchTeamSize", "UserMax", "ModifyTime",
+		"Province", "City", "Address", "Leader", "IndustryId", "IndustryName", "CapitalScale", "ResearchTeamSize", "ModifyTime",
 	}
 	if e := item.Update(cols); e != nil {
 		br.Msg = "操作失败"

models/eta_business/eta_business.go

@@ -265,11 +265,11 @@ type EtaBusinessAddReq struct {
 	IndustryName     string `description:"行业名称"`
 	CapitalScale     string `description:"资金规模"`
 	ResearchTeamSize string `description:"研究团队规模"`
-	UserMax          int    `description:"用户上限"`
-	SigningTime      string `description:"签约时间"`
-	ExpiredTime      string `description:"到期时间"`
-	IsCheck          bool   `description:"是否只做校验而不实际新增(业务操作上基础信息和签约时间分成两个步骤了)"`
-	Nation           string `description:"所属国家"`
+	//UserMax          int    `description:"用户上限"`
+	SigningTime string `description:"签约时间"`
+	ExpiredTime string `description:"到期时间"`
+	IsCheck     bool   `description:"是否只做校验而不实际新增(业务操作上基础信息和签约时间分成两个步骤了)"`
+	Nation      string `description:"所属国家"`
 }
 
 // EtaBusinessEditReq 编辑商家请求体
@@ -282,8 +282,8 @@ type EtaBusinessEditReq struct {
 	IndustryName     string `description:"行业名称"`
 	CapitalScale     string `description:"资金规模"`
 	ResearchTeamSize string `description:"研究团队规模"`
-	UserMax          int    `description:"用户上限"`
-	Nation           string `description:"所属国家"`
+	//UserMax          int    `description:"用户上限"`
+	Nation string `description:"所属国家"`
 }
 
 // EtaBusinessSigningReq 商家签约请求体