Merge branch 'CRM6.0' into debug

services/wechat_send_msg.go

@@ -256,7 +256,7 @@ func SendWxMsgWithRoadshowDetailResult(first, keyword1, keyword2, remark,mobile,
 		sendData["keyword2"] = map[string]interface{}{"value": keyword2, "color": "#173177"}
 		sendData["remark"] = map[string]interface{}{"value": remark, "color": "#173177"}
 
-		sendMap["template_id"] = utils.TemplateIdByCompanyApply
+		sendMap["template_id"] = utils.WxMsgTemplateIdWithRoadshowDetailResult
 		sendMap["url"] = redirectUrl
 		sendMap["data"] = sendData
 		//小程序信息