From baed9b68c8cb6b693d3c010f039d2c55bf242e0e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 十月 2025 18:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/AssetInventoryTask.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetInventoryTask.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetInventoryTask.java
index 5ce2a1d..f71d1bc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetInventoryTask.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetInventoryTask.java
@@ -49,8 +49,8 @@
     @ApiModelProperty(value = "盘点日期")
     @TableField("execute_date")
     private LocalDate executeDate;
-
-    @ApiModelProperty(value = "盘点状态 0-未开始,1-进行中,2-已完成")
+//0:未开始;1:进行中;2:已完成;3:已取消;
+    @ApiModelProperty(value = "盘点状态 0-未开始,1-进行中,2-已完成, 3-已取消")
     @TableField("status")
     private Integer status;
 

--
Gitblit v1.7.1