Merge branch 'yx_1.1' into debug

# Conflicts:
#	controllers/company_share.go
#	services/wechat_send_category_template_msg.go

services/wechat_send_category_template_msg.go

@@ -529,7 +529,7 @@ func SendWxCategoryMsgWithCygxActivitySignUpBySell(items []*cygx.CygxSignupUser)
 
 		sendInfo := new(SendWxCategoryTemplate)
 		sendInfo.Keywords = []string{keyword1, keyword2, keyword3, keyword4}
-		sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdActivityApplyXzs
+		sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdActivityPublishApply
 		sendInfo.RedirectUrl = utils.WX_MSG_PATH_ACTIVITY_DETAIL + strconv.Itoa(activityId)
 		sendInfo.RedirectTarget = 3
 		sendInfo.SendType = utils.TEMPLATE_MSG_APPLY