From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/service/StaDescService.java | 4 ++++
1 files changed, 4 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 fcbe144..13d18b8 100644
--- a/src/main/java/com/zy/asrs/service/StaDescService.java
+++ b/src/main/java/com/zy/asrs/service/StaDescService.java
@@ -11,4 +11,8 @@
StaDesc queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo);
+ StaDesc queryCrnStnAuto(Integer typeNo, Integer crnNo, Integer stnNo);
+
+ StaDesc queryCrnStn(Integer crnNo);
+
}
--
Gitblit v1.9.1