From 1de6b39bfe3967916dcab8122be0d69fbaba8cca Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 30 五月 2025 17:29:06 +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/Stock.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java
index 608d388..e2f3a8d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java
@@ -79,6 +79,12 @@
@ApiModelProperty(value= "搴撳瓨鏁伴噺")
private Double anfme;
+ @ApiModelProperty(value= "鏉″舰鐮�")
+ private String barcode;
+
+ @ApiModelProperty("搴撲綅")
+ private String locCode;
+
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
@@ -89,6 +95,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
--
Gitblit v1.9.1