From fb40c4dfec5954c321f38bb86e9d07eb87b97bfd Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 18 三月 2026 08:21:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

---
 src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java
index 1a2e5ab..d267986 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java
@@ -26,16 +26,18 @@
     /**
      * 璐ф灦鍚嶇О
      */
-    private String goodsShelvesName;
+    private String name;
     /**
      * 灞傛暟
      */
-    private Long storey;
+    @TableField("`row`")
+    private Long row;
 
     /**
      * 鍒楁暟
      */
-    private Long arrange;
+    @TableField("`col`")
+    private Long col;
 
     /**
      * 浠撳簱id

--
Gitblit v1.9.3