Merge remote-tracking branch 'origin/user_action' into user_action

zxl

1 天以前 f3ccf81a4f203dd0d8957bab15c491cb2181e071

 framework/src/main/java/cn/lili/modules/order/order/entity/dto/StoreCouponClaimRecordDTO.java

@@ -98,4 +98,6 @@
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date claimTime;

    private String orderStatus;
}