Merge remote-tracking branch 'origin/master-test' into master-test

fwq

2024-04-23 ebdd612ec22af566fa4a0707fef15e5e0a89e6fb

 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;

}