Merge branch 'test6.9.12' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.12

@@ -74,7 +74,7 @@ public class WalletChangeController {
         logger.info("enter assetWithdrawForPlat with param {}", walletChangeVO);
         WalletChangeBO reqBO = new WalletChangeBO();
         BeanUtils.copyProperties(walletChangeVO, reqBO);
-        return serviceCaller.call("wallet.assetWithdrawForPlat", reqBO, ApiResponse.class);
+        return serviceCaller.call("wallet.assetWithdrawForPlat", reqBO, ApiResponse.class, 3);
     }
 
     /**

@@ -45,4 +45,7 @@ ufo.user.idCertSwitch=false
 ufo.user.idCertUpdateVersionSwitch = true
 
 
-ufo.order.pay.transferWithWalletSwitch=true
\ No newline at end of file
+#time out
+hystrix.command.wallet.assetWithdrawForPlat.execution.isolation.thread.timeoutInMilliseconds=3000
+
+ufo.order.pay.transferWithWalletSwitch=true