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

fwq

2023-11-22 2a72c5fc5cc09fe98abe21e9cedd01142b0f17c7

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

@@ -22,10 +22,16 @@
    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;

}