Merge remote-tracking branch 'origin/master-test' into master-test

fwq

2024-04-11 dff9cfc66cdcb547578d99af6f5080dbdf902183

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

@@ -387,6 +387,7 @@

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