From 080b6ef99a53e35fc2c1fd5b4a3ef84e0656c98c Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 16 七月 2024 16:23:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java
index 14bcea8..f86f322 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java
@@ -2,8 +2,6 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.dy.common.webUtil.QueryConditionVo;
import jakarta.validation.constraints.NotNull;
import lombok.*;
@@ -17,7 +15,7 @@
@Builder
public class QueryVo {
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long id;
+ public Long workId;
/**
* 鐢ㄦ埛瀹炰綋缂栧彿
*/
@@ -32,8 +30,7 @@
* 宸ョ珯瀹炰綋缂栧彿
*/
@NotNull(message="[宸ョ珯瀹炰綋缂栧彿]涓嶈兘涓虹┖")
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long stationId;
+ public String stationId;
/**
* 缁勮鐢熶骇浠诲姟瀹炰綋缂栧彿
*/
@@ -52,6 +49,9 @@
@NotNull(message="[鐢熶骇娴佺▼鑺傜偣瀹炰綋缂栧彿]涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long nodeId;
+
+ @NotNull(message="[鐢熶骇娴佺▼鑺傜偣绫诲瀷]涓嶈兘涓虹┖")
+ public Integer workType;
/**
* 浠诲姟璁ら鏃堕棿
*/
@@ -72,15 +72,4 @@
* 杈呭姪浜哄憳:杈呭姪鍛樺伐id,浠ラ�楀彿闅斿紑
*/
public String assistants;
-
-
-
-
-
-
-
-
-
-
-
}
--
Gitblit v1.8.0