From 414c3baefcac09eaa30e70caf5ddb6423f8e2c20 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 11:00:56 +0800
Subject: [PATCH] DEMO初步完成

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskPageVo.java |    4 ++--
 1 files changed, 2 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..7e3a9f1 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,12 @@
     private String taskId;
 
     @ApiModelProperty(name = "任务时间")
-    private Date taskDate;
+    private String taskDate;
 
     @ApiModelProperty("任务内容")
     private String taskContent;
 
-    @ApiModelProperty("任务内容")
+    @ApiModelProperty("今日标记")
     private Integer todayFlag;
 
 }

--
Gitblit v1.7.1