From a88cf964159303c208d8a3a9d0b8dadef7b1388a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 12 Jan 2021 10:34:45 +0800
Subject: [PATCH] Merge branch 'api' into order_reform

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/SysFollowup.java |   37 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 36 insertions(+), 1 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 80839f0..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;
 			
 	
@@ -118,6 +117,42 @@
 	@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