From ff24db6d8456a8a2275fc2e91c62f77c815769a2 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 23 二月 2023 09:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lfdasrs' into lfdasrs
---
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index 6456b31..b2df62c 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -91,7 +91,7 @@
modiTimeEnd = DateUtils.convert(dates[1]);
} else if (entry.getKey().equals("wrk_no")) {
wrkNo = Integer.parseInt(val);
- } else if (entry.getKey().equals("condition")) {
+ } else if (entry.getKey().equals("order_no")) {
orderNo = val;
}
}
--
Gitblit v1.9.1