From add402ec68d150cd8b13c231ce991cf49889259c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 21 十月 2025 14:03:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java
index 7c7ddbf..fa8574c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java
@@ -43,8 +43,11 @@
@ApiModelProperty(value= "涓诲崟ID")
private Long locId;
- @ApiModelProperty("浠诲姟鏄庣粏ID")
+ @ApiModelProperty("浠诲姟ID")
private Long taskId;
+
+ @ApiModelProperty("搴撲綅鏄庣粏ID")
+ private Long locItemId;
/**
* 搴撲綅
@@ -194,6 +197,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
--
Gitblit v1.9.1