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/entity/param/MobileAdjustParam.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/param/MobileAdjustParam.java b/src/main/java/com/zy/asrs/entity/param/MobileAdjustParam.java index e8ac96a..87f9c6f 100644 --- a/src/main/java/com/zy/asrs/entity/param/MobileAdjustParam.java +++ b/src/main/java/com/zy/asrs/entity/param/MobileAdjustParam.java @@ -13,6 +13,8 @@ private Integer staNo; + private Integer wrkNo; + private List<WrkDetl> wrkDetls; } -- Gitblit v1.9.1