From 87f18dcf64a778555deb85312d4af93f86625c07 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 15:17:23 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskPageVo.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskPageVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskPageVo.java
index c1add92..5d2ddf7 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskPageVo.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskPageVo.java
@@ -21,12 +21,16 @@
private String taskId;
@ApiModelProperty(name = "任务时间")
- private Date taskDate;
+ private String taskDate;
@ApiModelProperty("任务内容")
private String taskContent;
- @ApiModelProperty("任务内容")
+ @ApiModelProperty("处理内容")
+ private String dealContent;
+
+
+ @ApiModelProperty("今日标记")
private Integer todayFlag;
}
--
Gitblit v1.7.1