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/TCrmSupplier.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmSupplier.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmSupplier.java
index e9f8312..6179141 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmSupplier.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmSupplier.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.time.LocalDateTime;
@@ -31,7 +32,7 @@
 
     @ApiModelProperty(value = "后台用户id")
     @TableField("user_id")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty(value = "供应商名称")
     @TableField("supplier_name")
@@ -45,10 +46,12 @@
     @TableField("supplier_contact")
     private String supplierContact;
 
+    @Length(max = 11, message = "手机号长度不能超过11个字符")
     @ApiModelProperty(value = "联系电话")
     @TableField("phone")
     private String phone;
 
+    @Length(max = 40, message = "账号长度不能超过40个字符")
     @ApiModelProperty(value = "账号")
     @TableField("account")
     private String account;
@@ -65,5 +68,9 @@
     @TableField("status")
     private Integer status;
 
+    @ApiModelProperty(value = "收款商户号")
+    @TableField("recv_merchant_no")
+    private String recvMerchantNo;
+
 
 }

--
Gitblit v1.7.1