Merge branch 'CRM_12.9' into debug

models/english_report_email/email.go

@@ -60,7 +60,7 @@ func CheckUserPwd(loginType int, countryCode, account, password string) (item *E
 		sql = `SELECT * FROM english_report_email WHERE email=? AND password=? AND is_deleted = 0 `
 		err = global.MYSQL["rddp"].Raw(sql, account, password).Scan(&item).Error
 	} else {
-		sql = `SELECT * FROM english_report_email WHERE country_code = ? mobile=? AND password=?  AND is_deleted = 0 `
+		sql = `SELECT * FROM english_report_email WHERE country_code = ? AND mobile=? AND password=?  AND is_deleted = 0 `
 		err = global.MYSQL["rddp"].Raw(sql, countryCode, account, password).Scan(&item).Error
 	}
 	return