From 533d26dae76cb5e54e84d6105f7aee42dcb9f76b Mon Sep 17 00:00:00 2001
From: CBin <497303054@qq.com>
Date: 星期三, 02 八月 2023 21:15:25 +0800
Subject: [PATCH] 接入微信支付

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyTaskPageVo.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyTaskPageVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyTaskPageVo.java
index e7416ca..566edc4 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyTaskPageVo.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyTaskPageVo.java
@@ -3,8 +3,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * @author jqs34
  * @ClassName MerMemberTaskPageVo
@@ -15,16 +13,20 @@
 @Data
 public class MerAgencyTaskPageVo {
 
-    @ApiModelProperty(name = "任务id")
+    @ApiModelProperty(value = "任务id")
     private String taskId;
 
-    @ApiModelProperty(name = "任务时间")
+    @ApiModelProperty(value = "任务时间")
     private String taskDate;
 
-    @ApiModelProperty("任务内容")
+    @ApiModelProperty(value="任务内容")
     private String taskContent;
 
-    @ApiModelProperty("今日标记")
+    @ApiModelProperty(value="今日标记")
     private Integer todayFlag;
 
+    @ApiModelProperty(value="紧急情况")
+    private String emergencyState;;
+
+
 }

--
Gitblit v1.7.1