Merge branch 'crm_15.7' into debug

controller/public.go

@@ -615,7 +615,7 @@ func ResearchSignUp(c *gin.Context) {
 		return
 	}
 	if count > 0 {
-		response.FailData("报名失败", "该手机号已报名", c)
+		response.FailData("该手机号已报名!", "该手机号已报名", c)
 		return
 	}
 	ob := &yb_research_signup_statistics.YbResearchSignupStatistics{

models/tables/yb_research_signup_statistics/model.go

@@ -10,6 +10,6 @@ func (m *YbResearchSignupStatistics) Create() (err error) {
 
 // GetBySandboxId 根据沙盘ID查询详情
 func GetSignUpCountByMobileAndBannerId(mobile string, bannerId int) (count int64, err error) {
-	err = global.DEFAULT_MYSQL.Table("yb_research_signup_statistics").Where("mobile = ? and banner_id=? ", mobile, bannerId).Count(&count).Error
+	err = global.DEFAULT_MYSQL.Table("yb_research_signup_statistics").Where("custom_mobile = ? and banner_id=? ", mobile, bannerId).Count(&count).Error
 	return
 }