From c501000155be318c8c56f06c60b764d42d14612b Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 13 六月 2025 20:38:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 596b72d..d251b85 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -629,9 +629,7 @@
                 waitPakin.setStandby1(detlDto.getStandby1());
                 waitPakin.setStandby2(detlDto.getStandby2());
                 waitPakin.setStandby3(detlDto.getStandby3());
-                if ("Y".equals(param.getTkFlag())) {
-                    waitPakin.setTkFlag(detlDto.getTkFlag());
-                }
+                waitPakin.setTkFlag(param.getTkFlag());
                 if (!waitPakinService.insert(waitPakin)) {
                     throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
                 }

--
Gitblit v1.9.1