Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM

Mila

2021-11-10 4b1785f145437033183fdf678e0b21626a86ff96

Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM

 pamapi/src/doc/¹w¬ù³æ/¹w¬ù«e¸ß°Ý.txt

@@ -13,7 +13,7 @@
    "email":"pollex@pollex.comm.tw",
    "contactType":"phone",
    "gender":"male",
    "age":20,
    "age":"20-25",
    "job":"專案經理",
    "requirement":"財務規劃,資產移轉",
    "hopeContactTime":"'星期一~星期五, 12:00~14:00, 18:00~21:00'",

 pamapi/src/doc/¹w¬ù³æ/ÅU°Ý¨ú±o©Ò¦³¦Û¤vªº¹w¬ù³æAPI

@@ -5,7 +5,6 @@


response body :

[
    {
        "id": 13,
@@ -13,7 +12,7 @@
        "email": "pollex@pollex.comm.tw",
        "contactType": "phone",
        "gender": "male",
        "age": 20,
        "age": null,
        "job": "專案經理",
        "requirement": "財務規劃,資產移轉",
        "communicateStatus": "reserved",
@@ -30,7 +29,7 @@
        "email": "pollex@pollex.comm.tw",
        "contactType": "phone",
        "gender": "male",
        "age": 20,
        "age": null,
        "job": "專案經理",
        "requirement": "財務規劃,資產移轉",
        "communicateStatus": "reserved",
@@ -40,5 +39,39 @@
        "agentNo": "admin",
        "customerId": 2,
        "name": "Jack"
    },
    {
        "id": 15,
        "phone": "09123456789",
        "email": "pollex@pollex.comm.tw",
        "contactType": "phone",
        "gender": "male",
        "age": null,
        "job": "專案經理",
        "requirement": "財務規劃,資產移轉",
        "communicateStatus": "reserved",
        "hopeContactTime": "'星期一~星期五, 12:00~14:00, 18:00~21:00'",
        "otherRequirement": "外幣投資",
        "appointmentDate": "2021-11-10T09:42:28.134Z",
        "agentNo": "admin",
        "customerId": 2,
        "name": "Jack"
    },
    {
        "id": 16,
        "phone": "09123456789",
        "email": "pollex@pollex.comm.tw",
        "contactType": "phone",
        "gender": "male",
        "age": "20-25",
        "job": "專案經理",
        "requirement": "財務規劃,資產移轉",
        "communicateStatus": "reserved",
        "hopeContactTime": "'星期一~星期五, 12:00~14:00, 18:00~21:00'",
        "otherRequirement": "外幣投資",
        "appointmentDate": "2021-11-10T09:44:43.445Z",
        "agentNo": "admin",
        "customerId": 2,
        "name": "Jack"
    }
]

 pamapi/src/main/java/com/pollex/pam/domain/Appointment.java

@@ -40,7 +40,7 @@
    private String gender;
    
    @Column(name = "age")
    private int age;
    private String age;
    
    @Column(name = "job")
    private String job;
@@ -107,11 +107,11 @@
        this.gender = gender;
    }

    public int getAge() {
    public String getAge() {
        return age;
    }

    public void setAge(int age) {
    public void setAge(String age) {
        this.age = age;
    }


 pamapi/src/main/java/com/pollex/pam/domain/AppointmentCustomerView.java

@@ -38,7 +38,7 @@
    private String gender;
    
    @Column(name = "age")
    private int age;
    private String age;
    
    @Column(name = "job")
    private String job;
@@ -108,11 +108,11 @@
        this.gender = gender;
    }

    public int getAge() {
    public String getAge() {
        return age;
    }

    public void setAge(int age) {
    public void setAge(String age) {
        this.age = age;
    }


 pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentCreateDTO.java

@@ -6,7 +6,7 @@
    private String email;
    private String contactType; //聯絡方式
    private String gender;
    private int age;
    private String age;
    private String job;
    private String requirement;
    private String hopeContactTime; //希望聯絡的時間
@@ -61,10 +61,10 @@
    public void setOtherRequirement(String otherRequirement) {
        this.otherRequirement = otherRequirement;
    }
    public int getAge() {
    public String getAge() {
        return age;
    }
    public void setAge(int age) {
    public void setAge(String age) {
        this.age = age;
    }
    public String getAgentNo() {

 pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentCustomerViewDTO.java

@@ -15,7 +15,7 @@
    private String email;
    private String contactType;
    private String gender;
    private int age;
    private String age;
    private String job;
    private String requirement;
    private ContactStatusEnum communicateStatus;
@@ -55,10 +55,10 @@
    public void setGender(String gender) {
        this.gender = gender;
    }
    public int getAge() {
    public String getAge() {
        return age;
    }
    public void setAge(int age) {
    public void setAge(String age) {
        this.age = age;
    }
    public String getJob() {

 pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentDTO.java

@@ -14,7 +14,7 @@
    private String email;
    private String contactType;
    private String gender;
    private int age;
    private String age;
    private String job;
    private String requirement;
    private ContactStatusEnum communicateStatus;
@@ -54,10 +54,10 @@
    public void setGender(String gender) {
        this.gender = gender;
    }
    public int getAge() {
    public String getAge() {
        return age;
    }
    public void setAge(int age) {
    public void setAge(String age) {
        this.age = age;
    }
    public String getJob() {