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 | 2 ++ 1 files changed, 2 insertions(+), 0 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 c3db41c..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,6 +14,8 @@ private Integer sourceStaNo; + private Integer liftNo; + private String barcode; // 搴撲綅瑙勬牸锛� 1浣庯紝2涓紝3楂橈級 -- Gitblit v1.9.1