From 4706fa0dcd761c13f0f7f33e4e7ab804e0a21f4f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 12 十月 2019 19:19:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralTaskRecord.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralTaskRecord.java b/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralTaskRecord.java
index 7ea11d3..ca1b8a3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralTaskRecord.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralTaskRecord.java
@@ -20,6 +20,10 @@
*/
@Table("yeshi_ec_integral_task_record")
public class IntegralTaskRecord implements Serializable {
+
+ public static int STATE_WAITING_RECIEVE = 0;// 绛夊緟棰嗗彇
+ public static int STATE_ALREAD_RECIEVE = 1;// 宸查鍙�
+ public static int STATE_INVALID = 2;// 澶辨晥
/**
*
*/
@@ -31,7 +35,7 @@
@Column(name = "ir_cid")
private Long cid;
-
+
@Column(name = "ir_task_id")
private Long taskId;
@@ -50,7 +54,7 @@
@Column(name = "ir_update_time")
private Date updateTime;
-
+
@Expose
private String taskName; // 浠诲姟鍚嶇О
--
Gitblit v1.8.0