Merge branch 'fhx-prod-FDD' into master-prod-new

fhx

2024-04-01 fcfc7c0510592aade38d4ef84070e0445964334c

 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;

}