From 5edad169a59ef92008c0d7896bd773a4230bf580 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期四, 03 四月 2025 10:53:29 +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/StockItem.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java
index d90bbe0..d256b0c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java
@@ -58,7 +58,7 @@
      * 鐗╂枡缂栫爜
      */
     @ApiModelProperty(value= "鐗╂枡缂栫爜")
-    private String code;
+    private String matnrCode;
 
 
     @ApiModelProperty(value = "閫氱煡鍗曟槑缁嗘爣璇�")
@@ -68,7 +68,7 @@
      * 鍚嶇О
      */
     @ApiModelProperty(value= "鍚嶇О")
-    private String matnrk;
+    private String maktx;
 
     /**
      * 鏁伴噺
@@ -269,8 +269,8 @@
         this.stockId = stockId;
         this.matnrId = matnrId;
         this.asnItemId = asnItemId;
-        this.code = code;
-        this.matnrk = matnrk;
+        this.matnrCode = code;
+        this.maktx = matnrk;
         this.anfme = anfme;
         this.workQty = workQty;
         this.qty = qty;

--
Gitblit v1.9.1