From 7e25a80c5bcb45ed9524a57e24bcabd0a0db625d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 24 四月 2022 11:46:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
index 860f2f2..2dc3bdc 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
@@ -8,10 +8,10 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
/**
@@ -22,10 +22,9 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_dept")
@ApiModel("閮ㄩ棬涓氬姟瀵硅薄")
-public class SysDept extends TreeEntity {
+public class SysDept extends TreeEntity<SysDept> {
private static final long serialVersionUID = 1L;
/**
@@ -47,8 +46,8 @@
* 鏄剧ず椤哄簭
*/
@ApiModelProperty(value = "鏄剧ず椤哄簭")
- @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- private String orderNum;
+ @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+ private Integer orderNum;
/**
* 璐熻矗浜�
--
Gitblit v1.9.3