Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

 src/main/java/org/springblade/modules/category/controller/CategoryLabelController.java

@@ -122,5 +122,13 @@
      return R.status(categoryLabelService.removeByIds(Func.toLongList(ids)));
   }

   /**
    * 场所标签临时表 分页
    */
   @GetMapping("/getAllList")
   public R getAllList(CategoryLabelVO categoryLabel) {
      return R.data(categoryLabelService.list());
   }


}