Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

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

@@ -47,8 +47,9 @@
    */
   List<HouseholdVO> selectHouseholdPage(IPage page,
                                @Param("household") HouseholdVO household,
                                @Param("isAdministrator") Integer isAdministrator,
                                @Param("regionChildCodesList") List<String> regionChildCodesList,
                                @Param("isAdministrator") Integer isAdministrator);
                                @Param("gridCodeList") List<String> gridCodeList);

   /**
    * 获取全部
@@ -91,7 +92,10 @@
    */
   List<HouseHoldExcel> export(@Param("household") HouseholdVO household);

   Integer statistics(Long userId, String neiCode);
   Integer statistics(@Param("household") HouseholdVO household,
                  @Param("isAdministrator") Integer isAdministrator,
                  @Param("regionChildCodesList") List<String> regionChildCodesList,
                  @Param("gridCodeList") List<String> gridCodeList);

   /**
    * 查询物业