Merge branch 'test'

DESKTOP-71BH0QO\L、ming

2021-04-28 15dbac0af6437e16b6606d5c790d614851493f02

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

@@ -195,9 +195,9 @@

    @ApiOperation(value = "家庭成员列表")
    @GetMapping("listfamily")
    public R listFamily() {
    public R listFamily(@RequestParam(value = "pageNum") Long pageNum, @RequestParam("pageNum") Long pageSize) {
        Long userId = this.getUserId();
        return userService.listFamily(userId);
        return userService.listFamily(userId, pageNum, pageSize);
    }

    @ApiOperation(value = "新增家庭成员")