From 15d0db28cb2f7c5214963a3c39b39dfddbe4f884 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 04 一月 2022 17:45:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantDetailDTO.java | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantDetailDTO.java b/pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantDetailDTO.java
index 46cc4e6..9f43ef6 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantDetailDTO.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantDetailDTO.java
@@ -1,18 +1,16 @@
package com.pollex.pam.service.dto;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
import java.time.Instant;
import java.util.List;
+
+import com.pollex.pam.enums.GenderEnum;
public class ConsultantDetailDTO {
private String name;
private String agentNo;
private String role;
- private String image;
+ private String img;
private Float avgScore;
private String title;
private String phoneNumber;
@@ -22,10 +20,12 @@
private String seniority;
private Number suitability;
private Number evaluation;
- private List<String> expertises;
+ private List<String> expertise;
private String concept;
- private List<String> experiences;
+ private String experiences;
private String awards;
+ private GenderEnum gender;
+ private String communicationStyle;
public String getName() {
return name;
@@ -51,12 +51,12 @@
this.role = role;
}
- public String getImage() {
- return image;
+ public String getImg() {
+ return img;
}
- public void setImage(String image) {
- this.image = image;
+ public void setImg(String img) {
+ this.img = img;
}
public Float getAvgScore() {
@@ -131,12 +131,12 @@
this.evaluation = evaluation;
}
- public List<String> getExpertises() {
- return expertises;
+ public List<String> getExpertise() {
+ return expertise;
}
- public void setExpertises(List<String> expertises) {
- this.expertises = expertises;
+ public void setExpertise(List<String> expertise) {
+ this.expertise = expertise;
}
public String getConcept() {
@@ -147,11 +147,11 @@
this.concept = concept;
}
- public List<String> getExperiences() {
+ public String getExperiences() {
return experiences;
}
- public void setExperiences(List<String> experiences) {
+ public void setExperiences(String experiences) {
this.experiences = experiences;
}
@@ -162,4 +162,21 @@
public void setAwards(String awards) {
this.awards = awards;
}
+
+ public GenderEnum getGender() {
+ return gender;
+ }
+
+ public void setGender(GenderEnum gender) {
+ this.gender = gender;
+ }
+
+ public String getCommunicationStyle() {
+ return communicationStyle;
+ }
+
+ public void setCommunicationStyle(String communicationStyle) {
+ this.communicationStyle = communicationStyle;
+ }
+
}
--
Gitblit v1.8.0