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

controllers/sz/sz_his_api_controller.go

@@ -345,7 +345,7 @@ func SZHisManagerApiRegistRouters() {
 
 	//查询交易
 	beego.Router("/sz/api/settle/query", &SZHisApiController{}, "get:GetSettleAccounts")
-	beego.Router("/sz/api/detail/upload", &SZHisApiController{}, "get:GetUploadDetail")
+	//beego.Router("/sz/api/detail/upload", &SZHisApiController{}, "get:GetUploadDetail")
 	beego.Router("/sz/api/detail/cancel", &SZHisApiController{}, "get:CancelOrderDetail")
 	//
 	////机构药品目录备案