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

fhx

2023-11-02 58a203b55e76111f330b86e2125d40d75dbebe9a

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

@@ -16,6 +16,8 @@
    private String recordName;
    /**公共标识*/
    private String commonId;
    /**公共子标识*/
    private String commonItemId;
    /**公共类型*/
    private String commonType;

@@ -35,4 +37,8 @@
    public static final String TYPE_COMMON_QUEEN_DAY = "queen_day";
    /**公共标识类型,crm商品详情领取优惠券*/
    public static final String TYPE_COMMON_GOODS_DETAILS = "goods_details";
    /**公共标识类型,订单购买优惠券*/
    public static final String TYPE_COMMON_ORDER = "order";
    /**公共标识类型,抽奖活动*/
    public static final String TYPE_COMMON_DRAW = "draw";
}