Merge remote-tracking branch 'origin/master'

linwe

2023-11-09 365b5ad817c9c8a2992d505aa39eccfa2be0460e

 src/main/java/org/springblade/modules/task/controller/TaskHotelReportingController.java

@@ -89,7 +89,7 @@
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "新增", notes = "传入taskHotelReporting")
   public R save(@Valid @RequestBody TaskHotelReportingEntity taskHotelReporting) {
      return R.status(taskHotelReportingService.save(taskHotelReporting));
      return R.status(taskHotelReportingService.saveHotelReporting(taskHotelReporting));
   }

   /**
@@ -99,7 +99,7 @@
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "修改", notes = "传入taskHotelReporting")
   public R update(@Valid @RequestBody TaskHotelReportingEntity taskHotelReporting) {
      return R.status(taskHotelReportingService.updateById(taskHotelReporting));
      return R.status(taskHotelReportingService.updateHotelReporting(taskHotelReporting));
   }

   /**