Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-07-04 2875be234bb2631071c09ab0852f5fb28af0e9ee

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

@@ -116,8 +116,12 @@
    Result userCouponCheckList(@RequestBody(required = false) CouponListDto couponListDto);

    /**
     * 优惠券统一校验接口
     * 根据skuid查询关联优惠券
     */
    @PostMapping(value = "/coupon/find/skuId")
    Result findGoodsSkuIdCoupon(@RequestBody(required = false) GoodsUsedCouponDto dto);

    /*下单校验优惠券是否可用*/
    @PostMapping(value = "/coupon/order/check")
    Result orderCheck(@RequestBody(required = false) CouponListDto couponListDto);
}