From 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 13:47:42 +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/StaffShopTaskPageVo.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/StaffShopTaskPageVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/StaffShopTaskPageVo.java
index 708da88..12ccb57 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/StaffShopTaskPageVo.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/StaffShopTaskPageVo.java
@@ -25,6 +25,9 @@
@ApiModelProperty(value="任务内容")
private String taskContent;
+ @ApiModelProperty(value="任务标题")
+ private String taskTitle;
+
@ApiModelProperty(value="紧急情况")
private String emergencyState;
@@ -40,7 +43,16 @@
@ApiModelProperty(value = "用户头像")
private String userPicture;
+ @ApiModelProperty(value = "用户岗位")
+ private String userPosition;
+
@ApiModelProperty(value="跟进时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date followTime;
+
+ @ApiModelProperty(value = "添加用户id")
+ private Long createUserId;
+
+ @ApiModelProperty(value = "任务状态0未开始1待处理2已处理3已过期")
+ private Integer taskStatus;
}
--
Gitblit v1.7.1