Merge branch 'master' into master-test

wangrenhuang

2023-07-05 334bb53b5f7881cbd6d587e03ecf032324142e2a

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