From 2028b51aeda2b6b23fda4183875b145d5e83822f Mon Sep 17 00:00:00 2001 From: zjj <zjj123456> Date: 星期三, 19 六月 2024 11:06:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs --- src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java index 3c04b8e..68b61ac 100644 --- a/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java +++ b/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java @@ -10,13 +10,13 @@ public class SiteDetailVo { // 绔欑偣缂栧彿 - private Integer devpNo; + private Integer siteId; // 宸ヤ綔鍙� - private Short workNo; + private Integer workNo; // 宸ヤ綔鐘舵�� - private String workStatus = ""; + private String wrkSts = ""; // 鑷姩 private String autoing; @@ -40,8 +40,8 @@ private String staNo = ""; // 婧愬簱浣� - private String sourceStock = ""; + private String sourceLocNo = ""; // 鐩爣搴撲綅 - private String stock = ""; + private String locNo = ""; } -- Gitblit v1.9.1