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

controllers/sg/his_api_controller.go

@@ -239,7 +239,7 @@ func (c *HisApiController) GetBasBaseInfo() string {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
 		return ""
 	}
-	return string(str1)
+	return string(str)
 
 }