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

fhx

2024-06-05 570e48eb85b3958f56ade7e58a1ab9ef5a4957ed

 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;

}