Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa

 Conflicts:
	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -350,6 +350,7 @@ public class OrderServiceImpl implements Orderservice {
     @Autowired
     private BuyProductOnceManager buyProductOnceManager;
 
+
     @Override
     public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {
         String trackingNo = LogTreadLocal.getTrackingNo();