From 5039fb11b2831475ad6d32592b4a4d5a03f0bcfa Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 09 十二月 2023 18:13:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 consum-base/src/main/java/com/consum/base/core/CheckWarehouseResult.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/core/CheckWarehouseResult.java b/consum-base/src/main/java/com/consum/base/core/CheckWarehouseResult.java
index 43aa245..bf435e7 100644
--- a/consum-base/src/main/java/com/consum/base/core/CheckWarehouseResult.java
+++ b/consum-base/src/main/java/com/consum/base/core/CheckWarehouseResult.java
@@ -18,7 +18,7 @@
     /**
      * 鎿嶄綔鏇存柊鎴栨柊澧炵殑WH_GOODS搴撳瓨鐗╁搧ID
      */
-    private WhGoods goods;
+    private WhGoods whGoods;
 
     /**
      * 鎵ц鎿嶄綔鏃剁殑鏈熷垵鏁伴噺
@@ -30,4 +30,9 @@
      */
     private int end_count;
 
+    /**
+     * 鍑哄叆搴撴祦姘碔D锛堜粎闄愬垎鍙戝嚭搴撲娇鐢級
+     */
+    private Long wh_goods_detail_id;
+
 }

--
Gitblit v1.9.1