From c93e76c57a98e35abbf62d2f514d9ba51efd3243 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 21 八月 2023 19:03:55 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskPageVo.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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..ba51931 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,7 @@
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;
/**
* @author jqs34
@@ -17,16 +13,22 @@
@Data
public class MerMemberTaskPageVo {
- @ApiModelProperty(name = "任务id")
+ @ApiModelProperty(value = "任务id")
private String taskId;
- @ApiModelProperty(name = "任务时间")
- private Date taskDate;
+ @ApiModelProperty(value = "任务时间")
+ private String taskDate;
- @ApiModelProperty("任务内容")
+ @ApiModelProperty(value="任务内容")
private String taskContent;
- @ApiModelProperty("任务内容")
+ @ApiModelProperty(value="处理内容")
+ private String dealContent;
+
+ @ApiModelProperty(value="紧急情况")
+ private String emergencyState;;
+
+ @ApiModelProperty(value="今日标记")
private Integer todayFlag;
}
--
Gitblit v1.7.1