From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java
index 9eb6697..0f55244 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java
@@ -32,7 +32,7 @@
@Resource
private HongBaoOrderService hongBaoOrderService;
- @Transactional(propagation = Propagation.NESTED, rollbackFor = Exception.class)
+ //@Transactional(propagation = Propagation.NESTED, rollbackFor = Exception.class)
public boolean addOrder(Order order) throws Exception {
order.setVersion(2);
WriteLock writeLock = orderLock.writeLock();
--
Gitblit v1.8.0