From 79ca12d963effcb9bd74ab8169c4573d270d9c47 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Sun, 3 Jan 2021 20:05:47 +0800
Subject: [PATCH] Fix merge conflicts.

---
 .../src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs
index c0db5cf517..028fa9a15a 100644
--- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs
+++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs
@@ -52,7 +52,7 @@ namespace Volo.Abp.Uow
             {
                 var defaultOptions = _serviceProvider.GetRequiredService<IOptions<AbpUnitOfWorkDefaultOptions>>().Value;
                 options.IsTransactional = defaultOptions.CalculateIsTransactional(
-                    autoValue: _transactionBehaviourProvider.IsTransactional
+                    autoValue: _serviceProvider.GetRequiredService<IUnitOfWorkTransactionBehaviourProvider>().IsTransactional
                                ?? !invocation.Method.Name.StartsWith("Get", StringComparison.InvariantCultureIgnoreCase)
                 );
             }