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/StaffAgencyTaskRecordPageVo.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/StaffAgencyTaskRecordPageVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/StaffAgencyTaskRecordPageVo.java
index 71ed4bd..0cb17a0 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/StaffAgencyTaskRecordPageVo.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/StaffAgencyTaskRecordPageVo.java
@@ -27,6 +27,9 @@
@ApiModelProperty(value = "用户头像")
private String userPicture;
+ @ApiModelProperty(value = "用户岗位")
+ private String userPosition;
+
@ApiModelProperty(value = "跟进id")
private Long followId;
@@ -38,7 +41,7 @@
private Date createTime;
@ApiModelProperty(value="跟踪类型1电话2手动")
- private Integer followType;
+ private String followType;
@ApiModelProperty(value="自定义跟进类型")
private String customeFollowType;
--
Gitblit v1.7.1