Merge branch 'master' into master-test

wangrenhuang

2023-06-28 2c541732a0bded0501845eedbd51f717d6b0e949

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

@@ -301,4 +301,16 @@
     * */
    @PostMapping(value = "/user/accumulat/consumption")
    Result accumulateConsumption(@RequestBody UserDto userDto);

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

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