From ae54e42cbe354ef5c39954eed2eab18de9504946 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 13 六月 2025 13:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzmsewcs' into tzmsewcs

---
 src/main/java/com/zy/asrs/service/LocMastService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 5e75f6b..e414ace 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -37,7 +37,7 @@
      * @param crn
      * @return
      */
-    LocMast queryDemoLoc(Integer crn);
+    LocMast queryDemoLoc(Integer crn,short locType1);
 
     /**
      * 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲�

--
Gitblit v1.9.1