Merge branch '禅道号42-his助手要有折扣申请订单，走营销助手审批' into master-test

zhouxiang

2022-11-08 29d7fca562017456c8316f1ca1a8302303197c11

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

@@ -27,4 +27,6 @@
    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";
}