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

fwq

2023-02-17 7b4da138fec5a10f36a4e8294e4d66a7631ab32b

 phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderCanUseCouponDto.java

@@ -21,6 +21,6 @@
    private Integer itemNum;
    /**子订单商品信息列表*/
    private List<OrderItemCouponDto> itemList;
    /**子订单商品信息列表*/
    /**接参*/
    private List<OrderItemCouponDto> goodsSkuList;
}