解决冲突

jiangping

2023-09-14 cf9b836069e0a76571c6611642b2d7abb0586a2b

 server/platform/src/main/java/com/doumee/api/business/CompanyUserController.java

@@ -36,8 +36,8 @@
     */
    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("company:company:query")
    public ApiResponse<PageData<CompanyUserDTO>> findPage(PageWrap<CompanyUserQueryDTO> pageWrap){
//    @RequiresPermissions("company:company:query")
    public ApiResponse<PageData<CompanyUserDTO>> findPage(@RequestBody PageWrap<CompanyUserQueryDTO> pageWrap){
        return ApiResponse.success(companyUserService.findPage(pageWrap));
    }

@@ -50,7 +50,7 @@
     */
    @ApiOperation("分页查询")
    @PostMapping("/findByUserId")
    @RequiresPermissions("company:company:query")
//    @RequiresPermissions("company:company:query")
    public ApiResponse<CompanyUserDTO> findByUserId(@RequestParam("userId") Integer userId){

        CompanyUserDTO company = new CompanyUserDTO();
@@ -66,7 +66,7 @@
     */
    @ApiOperation("分页查询")
    @GetMapping("/findListByCompanyID")
    @RequiresPermissions("company:company:query")
//    @RequiresPermissions("company:company:query")
    public ApiResponse<List<CompanyUserDTO>> findListByCompanyID(@RequestParam("companyId") Integer companyId){
        CompanyUserDTO company = new CompanyUserDTO();
        company.setCompanyId(companyId);