Merge branch 'master' into master-test

wangrenhuang

2023-07-16 3de90089345a2bb8c18114885a8d7dcd58a432ce

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