Merge branch 'cygx_10.5.3' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

# Conflicts:
#	controllers/user.go
#	models/db.go
#	services/wechat_send_msg.go

controllers/user.go

@@ -1121,7 +1121,6 @@ func (this *UserController) ApplyTryOut() {
 			applyMethod = applyMethod + "," + title
 		}
 	}
-	//如果对应销售不存在就给王芳，汪洋推模版消息
 	item := new(models.CygxApplyRecord)
 	item.UserId = user.UserId
 	item.BusinessCardUrl = req.BusinessCardUrl

services/wechat_send_msg.go

@@ -110,7 +110,6 @@ func SendPermissionApplyTemplateMsg(realName, companyName, mobile, applyMethod s
 		if err != nil {
 			go utils.SendAlarmMsg(fmt.Sprint("权限申请模板消息推送消息失败,手机号", mobile, "公司：", companyName, "手机号：", mobile, ";Err:"+err.Error()), 2)
 		}
-
 	}()
 	var first string
 	var keyword1 string