From 76c38d4e7a6e46f34f547fad873dc383c1397d00 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期六, 24 五月 2025 14:53:09 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 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 1dbf238..4bd525e 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,7 +197,6 @@ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚� */ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ") - @TableLogic private Integer deleted; /** -- Gitblit v1.9.1