From 257ce232897d0e4a232e827ba61516b747389078 Mon Sep 17 00:00:00 2001
From: zhanglin <852614290@qq.com>
Date: 星期日, 23 七月 2023 16:04:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskPageVo.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 3eb23a6..bfe0184 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
@@ -23,14 +23,14 @@
     @ApiModelProperty(value = "任务时间")
     private String taskDate;
 
-    @ApiModelProperty("任务内容")
+    @ApiModelProperty(value="任务内容")
     private String taskContent;
 
-    @ApiModelProperty("处理内容")
+    @ApiModelProperty(value="处理内容")
     private String dealContent;
 
 
-    @ApiModelProperty("今日标记")
+    @ApiModelProperty(value="今日标记")
     private Integer todayFlag;
 
 }

--
Gitblit v1.7.1