Merge branch 'master' of http://git.shengws.com/csx/gdyb

utils/csbhttp/httpparams.go

 */
 package csbhttp
 
-import ()
 import (
 	"encoding/json"
 	"fmt"
 }
 
 func (hp *HttpParams) SetContentBody(jsonStr string, byteArr []byte) error {
-	if jsonStr != "" && byteArr != nil {
-		errRtn := HttpCallerException{Message: "can not set jsonStr and byteArr parameters together!"}
-		return errRtn
-	}
+	//if jsonStr != "" && byteArr != nil {
+	//	errRtn := HttpCallerException{Message: "can not set jsonStr and byteArr parameters together!"}
+	//	return errRtn
+	//}
 
 	if jsonStr != "" {
 		hp.ct.jsonBody = jsonStr