-
Merge branch 'master' of http://git.2b3.cn/tencent/services · b2bc24c0
# Conflicts: # src/Common/Pool/Config/BuyerPoolConfig.php # src/Common/Pool/Config/SellerDistributionPoolConfig.php # src/Common/Pool/Config/SellerPoolConfig.php # src/Common/Pool/Config/VipPoolConfig.php # src/Order/Lib/OrderInterface.php
xmy committed