Merge branch 'fhx-prod-智能导诊' into master-test

fhx

2024-04-19 1b5fc79dd03377f95459878417514c1429336641

 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);

}