Merge branch 'dev2.6' of ssh://192.168.3.207:10022/qmx/qfw into dev2.6

common/src/qfw/util/mail/gmail.go

@@ -65,7 +65,7 @@ func GSendMail(from, to, cc, bcc, subject, body, fname, rename string, auth *Gma
 		m.Attach(fname, gomail.Rename(rename), gomail.SetHeader(h)) //添加附件
 		//m.Attach(fname) //添加附件
 	}
-	return gSend(2, auth, m, to)
+	return gSend(3, auth, m, to)
 }
 
 //如果附件是byte，用这个
@@ -87,7 +87,7 @@ func GSendMail_B(from, to, cc, bcc, subject, body, fname string, fb []byte, auth
 		m.Attach_new(fb, gomail.Rename(fname), gomail.SetHeader(h)) //添加附件
 		//m.Attach(fname) //添加附件
 	}
-	return gSend(0, auth, m, to)
+	return gSend(1, auth, m, to)
 }
 
 //