From 99091a8cbb8e098575c75a7c640b568addbcc29d Mon Sep 17 00:00:00 2001 From: wzy <wzy19931122ai@163.com> Date: Sun, 09 Oct 2022 21:41:13 +0800 Subject: [PATCH] Merge branch 'score_shop' --- zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java index 7ab47e4..e4435f5 100644 --- a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java +++ b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java @@ -66,13 +66,14 @@ private Date winTime; /** - * 状态(1:待兑换 2:待发货 3:已兑换 ) + * 状态(1:待兑换 2:待发货 3:已兑换 4:已失效 ) */ private Integer state; public static final int STATE_ONE = 1; public static final int STATE_TWO = 2; public static final int STATE_THREE = 3; - + public static final int STATE_FOUR = 4; + /** * 中奖者ID */ @@ -85,7 +86,7 @@ */ - private Long logisticsId; + private Integer logisticsId; /** * 中奖记录ID @@ -114,8 +115,6 @@ private Long writeoffUserid; - - } \ No newline at end of file -- Gitblit v1.9.1