Merge branch 'send_coupon' into user_action

peng

23 小时以前 e4dd7447aaa4563b9e64a7556710677a140776eb

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

@@ -105,6 +105,11 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date claimTime;

    @ApiModelProperty("订单状态")
    private String orderStatus;



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