From 5604c2dd5bb8bce148aaed0367e0cc84a09aedcc Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 28 四月 2025 17:41:10 +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/WaitPakinItem.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
index 27ec6bc..54c4503 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
@@ -43,11 +43,17 @@
@ApiModelProperty(value= "涓诲崟ID")
private Long pakinId;
+ @ApiModelProperty("璁㈠崟绫诲瀷")
+ private String type;
+
+ @ApiModelProperty("涓氬姟绫诲瀷")
+ private Short wkType;
+
/**
* 璁㈠崟ID
*/
@ApiModelProperty(value= "璁㈠崟ID")
- private Long ansId;
+ private Long asnId;
/**
* 璁㈠崟缂栫爜
@@ -131,7 +137,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
--
Gitblit v1.9.1