From 2438d8a83057fb46351faff26fc4832832909c9b Mon Sep 17 00:00:00 2001
From: ye_star <17705172417@189.cn>
Date: Mon, 27 Feb 2023 14:51:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=907.3.3=E3=80=91=E5=8C=85=E8=A3=85?=
 =?UTF-8?q?=E5=99=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/stylefeng/roses/kernel/wrapper/WrapperAop.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel-d-wrapper/wrapper-sdk/src/main/java/cn/stylefeng/roses/kernel/wrapper/WrapperAop.java b/kernel-d-wrapper/wrapper-sdk/src/main/java/cn/stylefeng/roses/kernel/wrapper/WrapperAop.java
index 970fe5b2d..c20faa42b 100644
--- a/kernel-d-wrapper/wrapper-sdk/src/main/java/cn/stylefeng/roses/kernel/wrapper/WrapperAop.java
+++ b/kernel-d-wrapper/wrapper-sdk/src/main/java/cn/stylefeng/roses/kernel/wrapper/WrapperAop.java
@@ -202,13 +202,14 @@ public class WrapperAop {
     private Map<String, Object> wrapPureObject(Object originModel, Class<? extends BaseWrapper<?>>[] baseWrapperClasses) {
 
         // 首先将原始的对象转化为map
-        Map<String, Object> originMap = BeanUtil.beanToMap(originModel);
+        Map<String, Object> originMap = null;
 
         // 经过多个包装类填充属性
         try {
             for (Class<? extends BaseWrapper<?>> baseWrapperClass : baseWrapperClasses) {
                 BaseWrapper baseWrapper = baseWrapperClass.newInstance();
                 Map<String, Object> incrementFieldsMap = baseWrapper.doWrap(originModel);
+                originMap = BeanUtil.beanToMap(originModel);
                 originMap.putAll(incrementFieldsMap);
             }
         } catch (Exception e) {

From dd66971d0428c87ea7205c1759bb3b3831aa56d7 Mon Sep 17 00:00:00 2001
From: ye_star <17705172417@189.cn>
Date: Sun, 12 Mar 2023 14:08:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=907.3.3=E3=80=91easyExcel=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d1b3999d9..f26e58380 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,7 @@
         <aliyun.java.sdk.core>3.0.0</aliyun.java.sdk.core>
         <aliyun.java.sdk.dm>3.1.0</aliyun.java.sdk.dm>
         <activation.version>1.1.1</activation.version>
-        <easy.excel.version>2.2.6</easy.excel.version>
+        <easy.excel.version>3.2.1</easy.excel.version>
         <pinyin4j.version>2.5.0</pinyin4j.version>
         <openfeign.version>2.2.6.RELEASE</openfeign.version>
         <seata.all.version>1.3.0</seata.all.version>