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

chenjiahe

2024-07-25 37993b3cf3243e6ffdacab526b04dd2284565a42

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

@@ -41,4 +41,8 @@
    public static final String TYPE_COMMON_ORDER = "order";
    /**公共标识类型,抽奖活动*/
    public static final String TYPE_COMMON_DRAW = "draw";
    /**公共标识类型,ken活动领取 */
    public static String TYPE_COMMON_ACTIVITY_KEN = "activity_ken";
    /**公共标识类型,ken活动领取 */
    public static String TYPE_COMMON_BURST_ACTIVITY = "burst_activity";
}