Merge remote-tracking branch 'origin/master'

linwe

2023-11-24 8a28bb397d5743edf1da5930db0d6d0fdd86b35e

 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java

@@ -17,7 +17,7 @@
package org.springblade.modules.house.mapper;

import org.apache.ibatis.annotations.Param;
import org.springblade.common.node.TreeNode;
import org.springblade.common.node.TreeStringNode;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.vo.HouseholdVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -49,7 +49,7 @@
    * @param userId
    * @return
    */
    List<TreeNode> selectHouseNodeList(@Param("userId") Long userId);
    List<TreeStringNode> selectHouseNodeList(@Param("userId") Long userId);

   /**
    * 查询房屋人员情况
@@ -65,6 +65,11 @@
    */
   HouseholdVO getHouseholdListById(@Param("household") HouseholdEntity household);

   /**
    * 导出
    * @param household
    * @return
    */
   List<HouseHoldExcel> export(HouseholdVO household);

   Integer statistics(Long userId);