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/impl/StaDescServiceImpl.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
index df20f50..d39cf02 100644
--- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
@@ -46,8 +46,7 @@
public StaDesc queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo) {
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", typeNo)
- .eq("stn_no", stnNo)
- .eq("crn_no", crnNo);
+ .eq("stn_no", stnNo);
StaDesc staDesc = this.selectOne(wrapper);
if (staDesc == null) {
throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
--
Gitblit v1.9.1