Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-07-06 96a3439306a4e7e3743f0d1c4b6253690f7fdf6c

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

@@ -307,4 +307,16 @@
     * */
    @PostMapping(value = "/user/check/upgraded/aesthetics")
    Result checkUpgradedAesthetics(@RequestBody UserDto userDto);

    /**
     * 判断用户是否为再升美学会员（是否有购买再升美学卡项订单）
     * */
    @PostMapping(value = "/user/check/consumption")
    Result checkConsumption(@RequestBody UserDto userDto);

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