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

fwq

2024-04-11 f31ae0176ba124a2a39121584f5c39c3de932157

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

@@ -22,10 +22,21 @@
    private Integer isBirthday;
    /**是否线下券*/
    private Integer isOffline = 0;
    /**优惠券码*/
    /**搜索,线下优惠券码/线上名称*/
    private String searchData;
    /**支付方式编号集合*/
    private List<String> payMethodList;
    /**优惠券平台*/
    private String platform;

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

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

}