fix

controllers/activity.go

@@ -1009,7 +1009,7 @@ func (this *ActivityCoAntroller) SignupCancel() {
 			err = errors.New("GetConfigByCode, Err: " + e.Error() + configCode)
 			return
 		}
-		openIdList, e := models.GetUserRecordListByMobile(4, cnf.ConfigValue)
+		openIdList, e := models.GetUserRecordListByMobile(4, cnf.ConfigValue+","+sellerItemQy.Mobile)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			err = errors.New("GetUserRecordListByMobile, Err: " + e.Error() + cnf.ConfigValue)
 			return

models/db.go

@@ -152,11 +152,8 @@ func init() {
 		new(CygxUserLabelArticle),
 		new(CygxUserLabelActivitySpecial),
 		new(CygxInviteCompany),
-<<<<<<< HEAD
-=======
 		new(CygxActivityPointsBill),
 		new(CygxActivityPointsCompany),
->>>>>>> master
 		new(CygxTagHistory),
 	)
 	// 记录ORM查询日志

services/activity.go

@@ -2159,7 +2159,7 @@ func ActivityUserRemind(user *models.WxUserItem, activityDetail *models.Activity
 			err = errors.New("GetConfigByCode, Err: " + e.Error() + configCode)
 			return
 		}
-		openIdList, e := models.GetUserRecordListByMobile(4, cnf.ConfigValue)
+		openIdList, e := models.GetUserRecordListByMobile(4, cnf.ConfigValue+","+sellerItemQy.Mobile)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			err = errors.New("GetUserRecordListByMobile, Err: " + e.Error() + cnf.ConfigValue)
 			return err