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

diff --git a/src/main/java/org/springblade/modules/house/excel/HouseHoldImporter.java b/src/main/java/org/springblade/modules/house/excel/HouseHoldImporter.java
index 0823881..146e632 100644
--- a/src/main/java/org/springblade/modules/house/excel/HouseHoldImporter.java
+++ b/src/main/java/org/springblade/modules/house/excel/HouseHoldImporter.java
@@ -1,25 +1,8 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.modules.house.excel;
 
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.excel.support.ExcelImporter;
 import org.springblade.modules.house.service.IHouseholdService;
-
 import java.util.List;
 
 /**
@@ -28,13 +11,13 @@
  * @author Chill
  */
 @RequiredArgsConstructor
-public class HouseHoldImporter implements ExcelImporter<HouseHoldExcel> {
+public class HouseHoldImporter implements ExcelImporter<ImportHouseholdExcel> {
 
 	private final IHouseholdService iHouseholdService;
 	private final Boolean isCovered;
 
 	@Override
-	public void save(List<HouseHoldExcel> data) {
+	public void save(List<ImportHouseholdExcel> data) {
 		iHouseholdService.importUserHouseHold(data, isCovered);
 	}
 }

--
Gitblit v1.9.3