Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-28 22a8cf0fc39555be78a030d208215fa7f6ad6bc4

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -786,4 +786,24 @@
    public R editUserTips(@RequestBody SysUserEditTipsDTO userEditTipsDTO) {
        return userService.editUserTips(userEditTipsDTO);
    }

    /**
     * 获取用户电子档案
     * @param userId 家庭成员信息
     * @return 结果
     */
    @GetMapping("getUserArchives")
    public R getUserArchives(@RequestParam("userId") Long userId){
        return userService.getUserArchives(userId);
    }

    /**
     * 编辑用户电子档案
     * @param userArchivesVO 编辑的信息
     * @return 编辑结果
     */
    @PostMapping("updateUserArchives")
    public R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO){
        return userService.updateUserArchives(userArchivesVO);
    }
}