Merge branch 'crm_15.7' into debug

controller/public.go

@@ -609,7 +609,7 @@ func ResearchSignUp(c *gin.Context) {
 	//	response.Fail(errMsg, c)
 	//	return
 	//}
-	count, err := yb_research_signup_statistics.GetSignUpCountByMobileAndBannerId(mobile, bannerId)
+	count, err := yb_research_signup_statistics.GetSignUpCountByMobileAndBannerId(customMobile, bannerId)
 	if err != nil {
 		response.FailData("查询失败", "查询失败，Err:"+err.Error(), c)
 		return

models/tables/yb_research_signup_statistics/model.go

@@ -8,8 +8,7 @@ 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("custom_mobile = ? and banner_id=? ", mobile, bannerId).Count(&count).Error
+func GetSignUpCountByMobileAndBannerId(CustomMobile string, bannerId int) (count int64, err error) {
+	err = global.DEFAULT_MYSQL.Table("yb_research_signup_statistics").Where("custom_mobile = ? and banner_id=? ", CustomMobile, bannerId).Count(&count).Error
 	return
 }