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

rx

2024-08-05 d621324bcf6c5a26f058b24e0f4d2930f41840f4

 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;

}