Merge remote-tracking branch 'origin/master'

jiangping

2023-12-15 e0965debdfc7149b9490d66d45c8737ca574ed21

 server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java

@@ -73,7 +73,7 @@
    @PostMapping("/updateById")
    @RequiresPermissions("business:company:update")
    public ApiResponse updateById(@RequestBody Company company) {
        companyService.updateById(company);
        companyService.updateLaborServicesById(company);
        return ApiResponse.success(null);
    }

@@ -84,6 +84,14 @@
        return ApiResponse.success(companyService.findPage(pageWrap));
    }


    @ApiOperation("修改状态")
    @PostMapping("/updateStatusById")
    @RequiresPermissions("business:company:update")
    public ApiResponse updateStatusById(@RequestBody Company company) {
        companyService.updateStatusById(company);
        return ApiResponse.success(null);
    }
    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:company:exportExcel")