Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

chenjiahe

2023-08-14 e023b237419249348ca4936a374197166779f066

 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;

}