Merge remote-tracking branch 'origin/fhx-base-预约整合0808' into master-xlk

fhx

2024-08-12 1cc8d819402db6729edcd2cf0349ae8ab1a84ce0

 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;

}