Merge branch 'master-fwq积分限购' into master-test

fwq

2023-07-18 627a1768b5953a01ff3df44532e75a0bb758c1dd

 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;

}