Merge branch 'master' into master-test

wangrenhuang

2023-02-03 d14051bf1ab6b9e5f723649375aca105a1e18354

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

@@ -27,6 +27,8 @@
    public static String TYPE_COMMON_GROUP_ACTIVITY = "group_activity";
    /**公共标识类型,老带新*/
    public static String TYPE_COMMON_OLD_NEW = "old_new";
    /**公共标识类型,团购活动*/
    /**公共标识类型,礼品卡*/
    public static String TYPE_COMMON_GIFT = "gift";
    /**公共标识类型,营销优惠券*/
    public static String TYPE_COMMON_MARKE = "marketing";
}