From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyTaskPageVo.java | 15 +++++++++------
1 files changed, 9 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..f5a81d1 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,21 @@
@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;;
+
+ @ApiModelProperty(value = "跟进时间")
+ private String followTime;
}
--
Gitblit v1.7.1