From 2168befb7a568614c120095c413fb0121e5408d6 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 17 九月 2025 10:01:46 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranch.java |    4 +++-
 1 files changed, 3 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..cc89016 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
@@ -6,6 +6,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -32,7 +33,7 @@
 
     @ApiModelProperty(value = "后台用户id")
     @TableField("user_id")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty(value = "分公司名称")
     @TableField("branch_name")
@@ -42,6 +43,7 @@
     @TableField("user_name")
     private String userName;
 
+    @Length(max = 11, message = "手机号长度不能超过11个字符")
     @ApiModelProperty(value = "电话")
     @TableField("phone")
     private String phone;

--
Gitblit v1.7.1