From f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:16:02 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/entity/param/AgvTaskParam.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvTaskParam.java b/src/main/java/com/zy/asrs/entity/param/AgvTaskParam.java
index c311939..29e036e 100644
--- a/src/main/java/com/zy/asrs/entity/param/AgvTaskParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/AgvTaskParam.java
@@ -4,10 +4,13 @@
@Data
public class AgvTaskParam {
- //涓氬姟浠诲姟鍙�
- private String taskCode;
- //浠诲姟浼樺厛绾�
- private int taskPriority;
- //浠诲姟鎻忚堪
- private AgvTaskkDescribeParam taskDescribe;
+ //浣嶇疆缂栧彿
+ private String positionCode;
+ //浣嶇疆绫诲瀷璇存槑 00琛ㄧず浣嶇疆缂栧彿
+ private String type;
+
+ public AgvTaskParam(String positionCode){
+ this.positionCode = positionCode;
+ this.type = "00";
+ }
}
--
Gitblit v1.9.1