Merge remote-tracking branch 'origin/master'

xuhy

2024-08-23 ebde3f4f38741aaa0764b2e319f89f93d3296449

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

@@ -34,7 +34,6 @@
            .like(unitListQueryDto.getCompanyName() != null && unitListQueryDto.getCompanyName().isEmpty(), TCompany::getName, unitListQueryDto.getCompanyName())
            .page(Page.of(unitListQueryDto.getPageCurr(), unitListQueryDto.getPageSize()));
      return R.ok(page);
		
   }
   
   //单位添加