Merge branch 'master-prod-new' into master-test

fwq

2024-07-08 6a3f8907a2f9d240f8a07e7283682286d2b52c75

 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;

}