Merge remote-tracking branch 'origin/rx-1023-营销优惠券新版' into master-test

rx

2023-10-24 97d7e38d0d0dc419672f9a6dbb12ac0e7f145553

 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;

}