From 3f7a3aefe2965459aed169383b285fba400cfe8c Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 04 六月 2023 13:13:54 +0800
Subject: [PATCH] Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/MemberTask.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/MemberTask.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/MemberTask.java
index 26f8afe..890cb9f 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/MemberTask.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/MemberTask.java
@@ -36,12 +36,16 @@
@TableField("user_id")
private Long userId;
@TableField("task_date")
- private Date taskDate;
+ private String taskDate;
@TableField("task_content")
private String taskContent;
@TableField("create_time")
private Date createTime;
-
+ /**
+ * 任务状态0未开始1待处理2已处理3已过期
+ */
+ @TableField("task_status")
+ private Integer taskStatus;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1