Merge remote-tracking branch 'origin/master'

linwei

2024-01-02 9cc50d2e2c3fcfff3c6b95c09806d3881a97c5ff

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

@@ -137,7 +137,7 @@
    */
   @PostMapping("/saveOrUpdateHousehold")
   @ApiOperation(value = "自定义新增或修改", notes = "传入household")
   public R saveOrUpdateHousehold(@Valid @RequestBody HouseholdEntity household) {
   public R saveOrUpdateHousehold(@Valid @RequestBody HouseholdVO household) {
      return R.status(householdService.saveOrUpdateHousehold(household));
   }