Merge branch 'send_coupon' into user_action

peng

2 天以前 e46e620ea7afd8b18aa24dde8e3c9564355fa14f

 framework/src/main/java/cn/lili/modules/lmk/domain/vo/StoreCouponClaimRecordVO.java

@@ -100,6 +100,11 @@
    @ApiModelProperty("活动类型")
    private String couponType;

    @ApiModelProperty("领取时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date claimTime;

    public static StoreCouponClaimRecordVO getVoByEntity(@NonNull StoreCouponClaimRecord entity, StoreCouponClaimRecordVO vo) {
        if(vo == null) {
            vo = new StoreCouponClaimRecordVO();