From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TDept.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TDept.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TDept.java
index 532ee46..93144fe 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TDept.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TDept.java
@@ -13,6 +13,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
@@ -36,6 +37,7 @@
private String id;
@NotBlank(message = "部门ID不能为空")
+ @Length(max = 10, message = "部门ID不能超过10个字符")
@ApiModelProperty(value = "部门id")
@TableField("dept_id")
private String deptId;
--
Gitblit v1.7.1