From beb6e85c9b054e8edced241c3367814a0a19d70c Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 07 Apr 2021 11:42:38 +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 | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 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 e27543d..4782536 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 @@ -1,14 +1,11 @@ package com.matrix.system.activity.entity; -import com.matrix.core.pojo.EntityDTO; -import com.matrix.system.score.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; import com.matrix.core.anotations.Extend; +import com.matrix.system.score.entity.BaseEntity; +import lombok.Data; import java.util.Date; - -import com.baomidou.mybatisplus.annotation.TableName; - -import lombok.Data; /** * @description 领 @@ -26,11 +23,11 @@ /** - * openID + * userId */ - private String openId; + private Long userId; /** * 领取时间 @@ -59,6 +56,9 @@ private Integer state; + + public static final int STATE_ING = 1; + public static final int STATE_DONE = 2; /** * 核销码 -- Gitblit v1.9.1