Merge remote-tracking branch 'origin/master'

zhangxu

2022-08-24 c8d8e3a8e7dab21ce0b2fced62bbd18f77d31d19

 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;

}