From 10f1422bc8f401b06b1e55ee63b23016d74abce8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 28 二月 2024 11:34:09 +0800
Subject: [PATCH] 优化商户发券逻辑
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskPageVo.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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..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
@@ -17,16 +15,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 List<String> dealContent;
+
+ @ApiModelProperty(value="紧急情况")
+ private String emergencyState;;
+
+ @ApiModelProperty(value="今日标记")
private Integer todayFlag;
}
--
Gitblit v1.7.1