Merge remote-tracking branch 'origin/master'

jiangping

2023-12-14 89a874ad57ff876070bd9a032cd9113facadb758

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

@@ -103,7 +103,7 @@

    @ApiOperation("分页劳务用户信息查询")
    @PostMapping("/findLaborMemberInfoPage")
    @RequiresPermissions("business:member:query")
//    @RequiresPermissions("business:member:query")
    public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap){
        return ApiResponse.success(memberService.findLaborMemberInfoPage(pageWrap));
    }
@@ -131,7 +131,7 @@
     */
    @ApiOperation("分页查询内部人员信息")
    @PostMapping("/findMemberInfoPage")
  //  @RequiresPermissions("business:member:query")
    @RequiresPermissions("business:member:query")
    public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
        return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
    }