Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-20 26cd8c7b2bc7a725a3de28d3ed883a6f54da84f1

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -540,6 +540,14 @@
    @GetMapping("getUserByPhone")
    R getSysUserVOByPhone(@RequestParam(value = "phone") String phone);

    /**
     * 通过账号查询用户信息
     * @param account
     * @return
     */
    @GetMapping("getUserByAccount")
    R getSysUserVOByAccountAndType(@RequestParam(value = "account") String account,@RequestParam(value = "type") Integer type);


    /**
     * 基础数据》居民管理》居民列表