Merge remote-tracking branch 'origin/master'

linwe

2023-11-24 8a28bb397d5743edf1da5930db0d6d0fdd86b35e

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

@@ -46,7 +46,7 @@
@AllArgsConstructor
@RequestMapping("blade-propertyCompany/propertyCompany")
@Api(value = "物业公司", tags = "物业公司接口")
public class PropertyCompanyController extends BladeController {
public class PropertyCompanyController {

   private final IPropertyCompanyService propertyCompanyService;

@@ -80,6 +80,14 @@
   public R<IPage<PropertyCompanyVO>> page(PropertyCompanyVO propertyCompany, Query query) {
      IPage<PropertyCompanyVO> pages = propertyCompanyService.selectPropertyCompanyPage(Condition.getPage(query), propertyCompany);
      return R.data(pages);
   }

   /**
    * 物业公司列表查询（不分页）
    */
   @GetMapping("/getPropertyCompanyList")
   public R getPropertyCompanyList(PropertyCompanyVO propertyCompany) {
      return R.data(propertyCompanyService.getPropertyCompanyList(propertyCompany));
   }

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