From eb23b15acb15aae43b336ecf5ffb2053bcf85464 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 09 九月 2025 18:05:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmWarehouse.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmWarehouse.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmWarehouse.java
index 19f4a45..3ee9591 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmWarehouse.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmWarehouse.java
@@ -31,7 +31,7 @@
 
     @ApiModelProperty(value = "后台用户id")
     @TableField("user_id")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty(value = "仓库名称")
     @TableField("warehouse_name")

--
Gitblit v1.7.1