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

fwq

2023-08-23 b0f290df690b64c9d96458a7a5a5f836ed338689

 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;

}