Merge branch 'master' into master-test

wangrenhuang

2023-10-23 85d1dc328bd46089b63b57bd356908cbba26e29c

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

@@ -257,6 +257,13 @@
    @PostMapping(value = "/user/crowd/import")
    Result userCrowdImport(@RequestBody UserDto userDto);

    /**
     * 获取用户信息，导入人群包专用
     * 根据CIQ或者名称全匹配查找用户
     */
    @PostMapping(value = "/user/crowd/import/new")
    Result userCrowdImportNew(@RequestBody UserPackListDto userPackListDto);


    /**
     * 获取用户子项目
@@ -327,4 +334,14 @@
     * */
    @PostMapping(value = "/user/rebate/userId")
    Result queryRebateByUserId(@RequestBody UserDto userDto);

    /**
     * 查询用户累计返佣
     * */
    @PostMapping(value = "/user/query/oldNewPerformance")
    Result queryOldNewPerformance(@RequestBody UserDto userDto);


    @PostMapping(value = "/user/draw/list")
    Result drawGetUserDt(@RequestBody UserDto userDto);
}