From f6fa17a3a817f8cc1743cb881aa9927227ed2867 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 31 五月 2022 13:36:55 +0800
Subject: [PATCH] add 新增 easyexcel 单元格合并注解与处理器

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 46e9936..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
@@ -24,7 +24,7 @@
 @EqualsAndHashCode(callSuper = true)
 @TableName("sys_dept")
 @ApiModel("閮ㄩ棬涓氬姟瀵硅薄")
-public class SysDept extends TreeEntity {
+public class SysDept extends TreeEntity<SysDept> {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -47,7 +47,7 @@
      */
     @ApiModelProperty(value = "鏄剧ず椤哄簭")
     @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
-    private Long orderNum;
+    private Integer orderNum;
 
     /**
      * 璐熻矗浜�

--
Gitblit v1.9.3