From 2a7a159b136805612e241e4e8e24affedfc23cc2 Mon Sep 17 00:00:00 2001 From: wzy <wzy19931122ai@163.com> Date: Sat, 20 Nov 2021 21:07:43 +0800 Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop --- zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java index ab7a432..07a2563 100644 --- a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java +++ b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java @@ -51,7 +51,7 @@ private Long awardId; /** - * 是否已领取（1：待领取2:已领取 3：待配送 4：待收货） + * 是否已领取（1：待领取2:已领取 3：待配送 4：待收货 5:已失效） */ @@ -61,6 +61,7 @@ public static final int STATE_DONE = 2; public static final int STATE_THREE = 3; public static final int STATE_FOUR = 4; + public static final int STATE_FIVE = 5; /** * 核销码 -- Gitblit v1.9.1