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

fhx

2023-08-08 ad4edbbf6ad2f20df3c21e60798ea649a47289ff

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

@@ -51,4 +51,9 @@

    /** 是否是营销助手申请 0=否 1=是*/
    private Integer isMarketApply = 0;

    /** 优惠券分类ID*/
    private String couponTypeId;
    /** 基础分类-优惠券*/
    private String type;
}