From 11ecb9ee39fc61af04cd8d462faf9dce496d1773 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 11 九月 2025 15:19:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranch.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranch.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranch.java
index 68838ac..0561aed 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranch.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranch.java
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "后台用户id")
@TableField("user_id")
- private Integer userId;
+ private Long userId;
@ApiModelProperty(value = "分公司名称")
@TableField("branch_name")
--
Gitblit v1.7.1