From 985e48474a3decdcab3d5d99dc0b5211b381c2a6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 09:19:45 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang 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