From 9f7fcb82f43ac4905623b0239d0f3ef7f4079e47 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 13 八月 2024 08:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java
index 91484d8..b1bd610 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java
@@ -11,23 +11,22 @@
@AllArgsConstructor
@Builder
public class QueryVo{
- @NotEmpty(message = "璁惧缂栧彿涓嶈兘涓虹┖")
- public String deviceNo;
+ //@NotEmpty(message = "璁惧缂栧彿涓嶈兘涓虹┖")
+ public String[] deviceNo;
@NotNull(message = "浠诲姟缂栧彿涓嶈兘涓虹┖")
- public String taskId;
- @NotNull(message = "鐘舵�佷笉鑳戒负绌�")
+ public String workId;
+ //@NotNull(message = "鐘舵�佷笉鑳戒负绌�")
public String status;
/**
* 娴嬭瘯鎴栧搧妫�杩斿洖鐨勯敊璇俊鎭�
*/
public String errorMsg;
/**
- * 杈呭姪浜哄憳
+ * 鍏朵粬鐨勫伐浣滃唴瀹�
*/
- public String assistants;
-
- public void setTaskId(String taskId) {
- taskId = taskId.replace("", "103");
- this.taskId = taskId;
- }
+ public String content;
+ /**
+ * 鍏朵粬鏁伴噺
+ */
+ public Integer number;
}
--
Gitblit v1.8.0