Merge branch 'master-prod-new'

wangrenhuang

2022-12-05 bc462093d1f6cbd69df926ac810b5e8d4555e30a

 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;

}