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

fwq

2023-11-10 05861c947332f646e713e1ffbb701cee0ca350d9

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

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

@@ -55,6 +55,8 @@
    private Integer isSelectGoods = 1;
    /**查询生日券*/
    private Integer isSelectBirthday;
    /**优惠券类型*/
    private String couponType;

    /** 优惠券分类ID*/
    private String couponTypeId;