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

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
index 8668481..cf337fb 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -45,7 +45,7 @@
      */
     @ApiModelProperty(value = "鏄剧ず椤哄簭")
     @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
-    private Long orderNum;
+    private Integer orderNum;
 
     /**
      * 璺敱鍦板潃

--
Gitblit v1.9.3