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

fhx

2023-11-02 930c25c31be5c0af2a1a8103fa29596e7cad2564

 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;

}