Merge remote-tracking branch 'origin/master'

wangrenhuang

2022-09-01 c47f76d00ae095e2cdf1fbd801e76f0306848f28

Merge remote-tracking branch 'origin/master'

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java

@@ -246,4 +246,13 @@
    @PostMapping(value = "/user/sms-find")
    Result userSms(@RequestBody UserDto userDto);

    /**
     * 获取用户信息，导入人群包专用
     * 根据CIQ或者名称全匹配查找用户
     * @param userDto 只使用name和CIQ
     * @return 转化使用UserDt
     */
    @PostMapping(value = "/user/crowd/import")
    Result userCrowdImport(@RequestBody UserDto userDto);

}

 phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java

@@ -67,4 +67,6 @@
    private String wechat;
    /**邮箱*/
    private String email;
    /**头像*/
    private String imgUrl;
}