Merge remote-tracking branch 'origin/master'

linwei

2024-01-06 4252aabea22574be7936c733036af88ee989de4e

 src/main/java/org/springblade/modules/house/controller/HouseholdController.java

@@ -65,7 +65,6 @@

   private final IHouseholdService householdService;


   /**
    * 住户 详情
    */
@@ -232,5 +231,16 @@
      return R.data(householdService.userHandle());
   }

   /**
    * 获取所有住户
    * @return
    */
   @GetMapping("/getAllHouseHold")
   public R getAllHouseHold(HouseholdVO household) {
      return R.data(householdService.getAllHouseHold(household));
   }




}