Merge branch 'rx-营销活动修改' into master-test

rx

2023-12-13 362db9d40ed24eca267187967824fe8b264ff095

 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;

}