From dbff53150cdc807faa56c0d1a947d24b69f372b9 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 31 八月 2023 18:43:20 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskPageVo.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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..8a09e93 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
@@ -1,11 +1,9 @@
package com.ruoyi.shop.domain.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.Date;
+import java.util.List;
/**
* @author jqs34
@@ -23,14 +21,16 @@
@ApiModelProperty(value = "任务时间")
private String taskDate;
- @ApiModelProperty("任务内容")
+ @ApiModelProperty(value="任务内容")
private String taskContent;
- @ApiModelProperty("处理内容")
- private String dealContent;
+ @ApiModelProperty(value="处理内容")
+ private List<String> dealContent;
+ @ApiModelProperty(value="紧急情况")
+ private String emergencyState;;
- @ApiModelProperty("今日标记")
+ @ApiModelProperty(value="今日标记")
private Integer todayFlag;
}
--
Gitblit v1.7.1