From 3fbef8c9533fea45f5ece7f8384fc8172d3fd4e2 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq,com>
Date: 星期三, 17 一月 2024 17:04:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs
---
src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
index f2b2d02..35c4d70 100644
--- a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
@@ -12,27 +12,32 @@
private Integer devNo;
// 宸ヤ綔鍙�
- private Short workNo;
+ private Short workNo = 0;
// 鑷姩
- private String autoing;
+ private String autoing = "-";
// 鏈夌墿
- private String loading;
+ private String loading = "-";
// 鍙叆
- private String inEnable;
+ private String inEnable = "-";
// 鍙嚭
- private String outEnable;
+ private String outEnable = "-";
// 闇�姹�1
- private String pakMk;
+ private String pakMk = "-";
// 绌烘澘淇″彿
- private String emptyMk;
+ private String emptyMk = "-";
// 鐩爣绔�
- private Short staNo;
+ private Short staNo = 0;
+ //楂樹綆搴撲綅
+ private String locType1 = "-";
+
+ private String autoIn = "-";
+ private String autoOut = "-";
}
--
Gitblit v1.9.1