Merge branch 'crm_15.7' into debug

controller/public.go

@@ -524,6 +524,7 @@ func BannerHistoryList(c *gin.Context) {
 func BannerGetQRCode(c *gin.Context) {
 	userId, _ := strconv.Atoi(c.Query("UserId"))
 	bannerId, _ := strconv.Atoi(c.Query("BannerId"))
+	remark := c.Query("Remark")
 	wxUserInfo, err := wx_user.GetByUserId(userId)
 	if err != nil {
 		response.Fail(err.Error(), c)
@@ -554,8 +555,8 @@ func BannerGetQRCode(c *gin.Context) {
 	randStr := utils.GetRandStringNoSpecialChar(28)
 	filePath := "./static/" + randStr + ".png"
 	fileName := randStr + ".png"
-	url := "pages-report/signUpPage/signUpPage&RealName?%s&CompanyName?%s&Mobile?%s&BannerId?%d"
-	url = fmt.Sprintf(url, wxUserInfo.RealName, companyName, userDetail.Mobile, bannerId)
+	url := "pages-report/signUpPage/signUpPage?RealName=%s&CompanyName=%s&Mobile=%s&BannerId=%d&Title=%s"
+	url = fmt.Sprintf(url, wxUserInfo.RealName, companyName, userDetail.Mobile, bannerId,remark)
 
 	err = qrcode.WriteFile(url, qrcode.Medium, 256, filePath)
 	if err != nil {