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

controllers/sg/his_api_controller.go

@@ -234,7 +234,7 @@ func (c *HisApiController) GetBasBaseInfo() string {
 	fmt.Println(string(str1))
 	fmt.Println(string(str))
 
-	if ret2 != nil {
+	if ret2 != 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
 		return ""
 	}