From 28a7821e43bd5763739fe67384cfea6693b3500b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 08 九月 2020 13:19:26 +0800
Subject: [PATCH] Merge branches 'gdwcs' and 'jswcs' of https://gitee.com/luxiaotao1123/zy-wcs into jswcs

---
 src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java |   16 ++++++++--------
 1 files changed, 8 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 54cde54..aa3f0d3 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,27 @@
     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 inreq1;
+    private String pakMk = "-";
 
     // 绌烘澘淇″彿
-    private String emptyMk;
+    private String emptyMk = "-";
 
     // 鐩爣绔�
-    private Short staNo;
+    private Short staNo = 0;
 
 }

--
Gitblit v1.9.1