From ecd6e50d0bb2c74e4b3f7a23e0d44f5e001987ea Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 13:57:47 +0800
Subject: [PATCH] 冲突解决
---
src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
index a19e440..4372314 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
@@ -28,12 +28,14 @@
/**
* 灞傛暟
*/
- private Long storey;
+ @TableField("`row`")
+ private Long row;
/**
* 鍒楁暟
*/
- private Long arrange;
+ @TableField("`col`")
+ private Long col;
/**
* 璐ф灦id
--
Gitblit v1.9.3