From a9f950c0d11a687a7a940443b8c765f6d87ae4f1 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:26:22 +0800
Subject: [PATCH] 合并新的修改
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysFollowup.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysFollowup.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysFollowup.java
index d442a6c..3085a5c 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysFollowup.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysFollowup.java
@@ -32,7 +32,6 @@
/**
* 员工ID
*/
- @NotNull(message = "员工ID")
private Long staffId;
@@ -111,13 +110,49 @@
private List<SysUsers> zanUsers;
@Extend
- @ApiModelProperty(value = "图片集合", example = "[{\"img\":\"http:123.2.3.4/upload/121321.png\"},{\"img\":\"http:123.2.3.4/upload/121321.png\"}")
+ @ApiModelProperty(value = "图片集合", example = "")
private List<SysVipAlbum> albums;
@Extend
@ApiModelProperty(value = "评论集合",example ="")
private List<SysFollowupComment> followupComments;
+ @Extend
+ @ApiModelProperty(value = "员工名称",example ="")
+ private String staffName;
+
+ @Extend
+ @ApiModelProperty(value = "员工头像",example ="")
+ private String staffPhoto;
+
+ @Extend
+ @ApiModelProperty(value = "客户名称",example ="")
+ private String vipName;
+
+ public String getStaffName() {
+ return staffName;
+ }
+
+ public void setStaffName(String staffName) {
+ this.staffName = staffName;
+ }
+
+ public String getStaffPhoto() {
+ return staffPhoto;
+ }
+
+ public void setStaffPhoto(String staffPhoto) {
+ this.staffPhoto = staffPhoto;
+ }
+
+ public String getVipName() {
+ return vipName;
+ }
+
+ public void setVipName(String vipName) {
+ this.vipName = vipName;
+ }
+
public List<SysFollowupComment> getFollowupComments() {
return followupComments;
}
--
Gitblit v1.9.1