Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

 src/main/java/org/springblade/modules/property/controller/PropertyChargeController.java

@@ -113,8 +113,7 @@
   @ApiOperationSupport(order = 7)
   @ApiOperation(value = "逻辑删除", notes = "传入ids")
   public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
      List<Integer> toIntList = Func.toIntList(ids);
      return R.status(propertyChargeService.removeBatchByIds(toIntList));
      return R.status(propertyChargeService.removeByIds(Func.toLongList(ids)));
   }

}