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

wangrenhuang

2022-11-07 3b7581302106b9a79bf518cfab7dfb48ee2e05fd

 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;

}