From 34396de03a38fbda0caa8f4afcc55fdae4c9b4e7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 31 五月 2022 13:37:16 +0800
Subject: [PATCH] update 优化 ExcelUtil 工具支持合并处理器
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 00c7444..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
@@ -71,13 +71,13 @@
* 鏄惁涓哄閾撅紙0鏄� 1鍚︼級
*/
@ApiModelProperty(value = "鏄惁涓哄閾撅紙0鏄� 1鍚︼級")
- private Integer isFrame;
+ private String isFrame;
/**
* 鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級
*/
@ApiModelProperty(value = "鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級")
- private Integer isCache;
+ private String isCache;
/**
* 绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛�
--
Gitblit v1.9.3