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/StaffShopTaskPageVo.java |    9 +++++++++
 1 files changed, 9 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 e3ae743..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
@@ -43,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