Merge branch 'master' into master-test

wangrenhuang

2023-06-25 b4707c89691166e9febc0e3321c0ecea6d5c30f3

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