Merge branch 'master-fwq-积分抵扣现金' into master-prod-new

fwq

2024-05-01 623afb6fbb8ce6adebf237e7b670d9f4f339184d

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

@@ -384,4 +384,12 @@
    @PostMapping(value = "/user/merge/log")
    Result userMergeLog(@RequestBody UserDto userDto);


    /**
     * 查询用户VIP记录以及要领取的优惠券,传userId字段
     * 返回实体转换 UserCouponDataVo
     * */
    @PostMapping(value = "/user/vip/log/coupon")
    Result userVipLogCoupon(@RequestBody UserDto userDto);

}