Merge branch 'master' into master-test

wangrenhuang

2023-06-28 094f1834f16cedf6381e3028416988ac9a76bd7a

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

@@ -313,4 +313,10 @@
     * */
    @PostMapping(value = "/user/check/consumption")
    Result checkConsumption(@RequestBody UserDto userDto);

    /**
     * 查询用户累计返佣
     * */
    @PostMapping(value = "/user/rebate/userId")
    Result queryRebateByUserId(@RequestBody UserDto userDto);
}