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/SiteTableVo.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 aa3f0d3..8512360 100644
--- a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
@@ -12,7 +12,7 @@
private Integer devNo;
// 宸ヤ綔鍙�
- private Short workNo = 0;
+ private Integer workNo = 0;
// 鑷姩
private String autoing = "-";
@@ -35,4 +35,6 @@
// 鐩爣绔�
private Short staNo = 0;
+ //楂樹綆搴撲綅
+ private String locType1 = "-";
}
--
Gitblit v1.9.1