Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-03-23 9f53055abd60eb0fb5d8060587124012d77d8ab6

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

@@ -16,4 +16,19 @@
    private String recordName;
    /**公共标识*/
    private String commonId;
    /**公共类型*/
    private String commonType;

    /**公共标识类型,充值订单标识*/
    public static String TYPE_COMMON_ORDER_RECHARGE = "recharge";
    /**公共标识类型,智能营销推送*/
    public static String TYPE_COMMON_PUSH_PLAN = "push_plan";
    /**公共标识类型,团购活动*/
    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";
}