Merge remote-tracking branch 'origin/master'

xuhy

2024-08-17 477be92633089830178b9b98af7a1ffd20e2f8f2

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java

@@ -48,8 +48,8 @@
   }
   
   @PostMapping(value = "/unit/delete")
   public R<TCompany> delete(@RequestParam("id") Integer id) {
      return R.ok(companyService.getById(id));
   public R delete(@RequestParam("id") Integer id) {
      return R.ok(companyService.removeById(id));
   }
}