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

wangrenhuang

2023-03-29 910e676fe6160906a59127d6e6a6fa078b27efa9

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

@@ -31,4 +31,6 @@
    public static String TYPE_COMMON_GIFT = "gift";
    /**公共标识类型,营销优惠券*/
    public static String TYPE_COMMON_MARKE = "marketing";
    //三八妇女节领取优惠券
    public static final String TYPE_COMMON_QUEEN_DAY = "queen_day";
}