From 4809db01709fd66fe3a25452ef41a6378b6ac6c8 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 一月 2026 11:18:21 +0800
Subject: [PATCH] Merge branch 'dev_tide' into dev_tide_cbsglxt

---
 src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java b/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java
index f8c522c..a8ae602 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java
@@ -38,7 +38,7 @@
      * 鍒涘缓鐢ㄦ埛
      */
     @TableField(fill = FieldFill.INSERT)
-    private Long createUser;
+    private Integer createUser;
 
     /**
      * 淇敼鏃堕棿
@@ -50,7 +50,7 @@
      * 淇敼鐢ㄦ埛
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Long updateUser;
+    private Integer updateUser;
 
     /**
      * 绉熸埛ID

--
Gitblit v1.9.3