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

chenjiahe

2023-07-03 00b97acec0f98d7f4f4a62e16ca182823ce983e2

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

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