From ff62f0248bf911a28ffc554447ee63b718d836df Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 12 十二月 2025 13:15:13 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

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

diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index dd6a4a7..df6b959 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -206,7 +206,7 @@
                 wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                 wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
             } else {
-                if (entry.getKey().equals("locNo")) {
+                if (entry.getKey().equals("locNo") || entry.getKey().equals("loc_no")) {
                     wrapper.eq("loc_no", String.valueOf(entry.getValue()));
                 } else {
                     wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));

--
Gitblit v1.9.1