From 84e12ecd3923f28b62b8659b138a554b0f6e084d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 30 一月 2026 15:16:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rcs_master' into rcs_master
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/StaReserve.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/StaReserve.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/StaReserve.java
index 05d23c2..8e43706 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/StaReserve.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/StaReserve.java
@@ -11,6 +11,10 @@
import java.io.Serializable;
import java.util.Date;
+// create task - reserved
+// agv load/unload request - waiting
+// well done - confirmed
+
@Data
@TableName("man_sta_reserve")
public class StaReserve implements Serializable {
@@ -63,6 +67,7 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date confirmedAt;
+ // 鐢ㄤ笉鍒帮紝浣跨敤纭鏃堕棿浠ｆ浛
@ApiModelProperty(value= "鍙栨秷鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date cancelledAt;
--
Gitblit v1.9.1