Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

# Conflicts:
#	hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderServiceImpl.java

hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderServiceImpl.java

@@ -58,16 +58,12 @@ public class ApiOrderServiceImpl implements ApiOrderService {
 
 
     @Override
-    @Transactional(rollbackFor=Exception.class,propagation= Propagation.REQUIRES_NEW)
     public ApiOrder createOrder(JSONObject object) throws Exception {
-
         ApiOrder apiOrder = new ApiOrder();
 
-
         //  获取下单内容
         JSONObject dataObject = JSONObject.parseObject(object.getString("content"));
 
-
         CreateOrderModel createOrderModel = new CreateOrderModel();
         createOrderModel.setChildOrderList(new ArrayList<>());