From ac92d2777fc472ae766e2bd6209c70691fe5dc5b Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 08 一月 2025 16:28:01 +0800
Subject: [PATCH] Merge branch 'mdqdasrs-auto' into mdqdasrsVersion
---
src/main/java/com/zy/common/service/CommonService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index f651036..0a54bcf 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -150,7 +150,7 @@
.eq("loc_no", shallowLoc));
if (!Cools.isEmpty(locMast2)) {
if (locMast2.getLocSts().equals("F") || locMast2.getLocSts().equals("D")){
- tmp = locMast2;
+ tmp = mast;
}
}
}else {
--
Gitblit v1.9.1