Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-20 4e8be752d24ae22362455c16f75d3bcbccb23359

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

@@ -611,6 +611,16 @@
    }

    /**
     * 通过账号和渠道查询用户信息
     * @param account
     * @return
     */
    @GetMapping("getUserByAccount")
    public R getSysUserVOByAccount(@RequestParam(value = "account") String account,@RequestParam(value = "type") Integer type){
        return userService.getSysUserVOByAccount(account, type);
    }

    /**
     *分页查询人口管理
     * @param pageInputUserDTO 查询参数
     * @return 分页数据