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-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java
index ef26ff3..1e89650 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java
@@ -48,7 +48,7 @@
      */
     @ExcelProperty(value = "鎺掑簭鍙�")
     @ApiModelProperty("鎺掑簭鍙�")
-    private Long orderNum;
+    private Integer orderNum;
 
     /**
      * key閿�

--
Gitblit v1.9.3