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/common/web/param/SearchLocParam.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/web/param/SearchLocParam.java b/src/main/java/com/zy/common/web/param/SearchLocParam.java
index df746f0..b75ca5d 100644
--- a/src/main/java/com/zy/common/web/param/SearchLocParam.java
+++ b/src/main/java/com/zy/common/web/param/SearchLocParam.java
@@ -14,9 +14,11 @@
private Integer sourceStaNo;
+ private Integer liftNo;
+
private String barcode;
- // 搴撲綅瑙勬牸锛� 0:鏈煡, 1:浣庡簱浣�, 2:楂樺簱浣嶏級
+ // 搴撲綅瑙勬牸锛� 1浣庯紝2涓紝3楂橈級
private Short locType1;
}
--
Gitblit v1.9.1