Merge branch 'fhx-prod-智能导诊' into master-test

fhx

2024-04-11 b2ad4b914ccaf0c22e382855d18d9bca64f016aa

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

@@ -51,6 +51,12 @@

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

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