From 32c6af05f94203a7d604a97bbf6495887cc4e526 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 12 十一月 2024 09:59:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index f4e9466..3656f9b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -2989,7 +2989,7 @@
 
                 boolean b = hisApiMethod.ZfBlXm(dto.getBldhs(), order);
                 if (!b) {
-                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     log.info("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
                     return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
                 }

--
Gitblit v1.8.0