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

fwq

2023-11-10 c9b961b7072bd872d9caa5a285ac6e3e583d45a9

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

@@ -51,6 +51,10 @@

    /** 是否是营销助手申请 0=否 1=是*/
    private Integer isMarketApply = 0;
    /**是否查询关联信息*/
    private Integer isSelectGoods = 1;
    /**查询生日券*/
    private Integer isSelectBirthday;

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