Merge remote-tracking branch 'origin/master'

linwe

2023-11-25 8400a67289b214b83a20484410fff96d236c6d49

 src/main/java/org/springblade/modules/district/controller/DistrictController.java

@@ -119,7 +119,15 @@
   @ApiOperationSupport(order = 7)
   @ApiOperation(value = "逻辑删除", notes = "传入ids")
   public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
      return R.status(districtService.removeByIds(Func.toLongList(ids)));
      return R.status(districtService.removeByIds(Func.toStrList(ids)));
   }

   /**
    * 获取小区树
    */
   @GetMapping("/getDistrictTree")
   public R getDistrictTree(DistrictVO district) {
      return R.data(districtService.getDistrictTree(district));
   }