From f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:16:02 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/service/StaDescService.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/StaDescService.java b/src/main/java/com/zy/asrs/service/StaDescService.java
index a5824b1..13d18b8 100644
--- a/src/main/java/com/zy/asrs/service/StaDescService.java
+++ b/src/main/java/com/zy/asrs/service/StaDescService.java
@@ -9,4 +9,10 @@
List<Integer> queryOutStaNosByLocNo(String locNo, Integer typeNo);
+ StaDesc queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo);
+
+ StaDesc queryCrnStnAuto(Integer typeNo, Integer crnNo, Integer stnNo);
+
+ StaDesc queryCrnStn(Integer crnNo);
+
}
--
Gitblit v1.9.1