Merge branch '禅道号268-新的优惠券使用规则-叠加券' into master-prod-new

zhouxiang

2022-12-28 87a9aade5539d7be459059ab07566af148b40a0e

 phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardUsedDto.java

@@ -13,6 +13,8 @@
    private String userId;
    /**子订单编号*/
    private String orderItemNo;
    /**卡包标识*/
    private String cardId;

}