From ea7ea2ec59a50db2fec8228efc81a63afd8283de Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 21 二月 2022 10:40:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java | 7 +++----
1 files changed, 3 insertions(+), 4 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..46e9936 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,7 +22,6 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_dept")
@ApiModel("閮ㄩ棬涓氬姟瀵硅薄")
public class SysDept extends TreeEntity {
@@ -47,8 +46,8 @@
* 鏄剧ず椤哄簭
*/
@ApiModelProperty(value = "鏄剧ず椤哄簭")
- @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- private String orderNum;
+ @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+ private Long orderNum;
/**
* 璐熻矗浜�
--
Gitblit v1.9.3