From fe81eb39c7402082f54e6aaee491efbcbb1aa50a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 15 May 2024 13:13:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index b1b2729..873fc47 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -557,7 +557,7 @@
</select>
<!--导出数据-->
- <select id="export" resultType="org.springblade.modules.house.excel.HouseHoldExcel">
+ <select id="export" resultType="org.springblade.modules.house.excel.ImportHouseholdExcel">
select
jh.house_code houseCode,
jh.name,jh.phone_number phoneNumber,jh.role_type roleType,jh.relationship relationship,
--
Gitblit v1.9.3