Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-20 4e8be752d24ae22362455c16f75d3bcbccb23359

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

@@ -546,7 +546,7 @@
     * @return
     */
    @GetMapping("getUserByAccount")
    R getSysUserVOByAccount(@RequestParam(value = "account") String account);
    R getSysUserVOByAccountAndType(@RequestParam(value = "account") String account,@RequestParam(value = "type") Integer type);


    /**