Merge branch 'master' into master-test

wangrenhuang

2023-11-21 1cc34b1ca79017139b79756dcd6247eb47fc41b6

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

@@ -19,6 +19,8 @@
    private BigDecimal total;
    /**满足件数*/
    private Integer itemNum;
    /**平台类型*/
    private String platform;
    /**商品crm sku标识*/
    private List<OrderUseGoodsDto> goodsSkuList;
}