Merge branch 'master-fwq-积分抵扣现金' into master-prod-new

fwq

2024-05-01 623afb6fbb8ce6adebf237e7b670d9f4f339184d

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java

@@ -26,13 +26,15 @@
    private String searchData;
    /**支付方式编号集合*/
    private List<String> payMethodList;
    /**优惠券平台*/
    /**优惠券平台:crm;p-his*/
    private String platform;

    /** 订单标识List */
    private List<String> orderIdList;
    /** 订单标识 */
    private String orderId;
    /** 标志标识 */
    private String commonId;

    /**要结账操作平台APPID*/
    private String appId;