Merge branch 'dev' of http://gitlab.secoo.com:8090/mall/arch/matrix into dev

common-core/src/main/java/com/secoo/mall/common/core/aop/AopTransaction.java

@@ -4,6 +4,7 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionDefinition;
@@ -14,6 +15,7 @@ import javax.annotation.Resource;
 
 @Aspect
 @Component
+@ConditionalOnProperty(value = "transaction.support.enabled",havingValue = "true")
 public class AopTransaction {
     @Resource
     private PlatformTransactionManager transactionManager;