Merge branch 'pollex-dev' into sit

wayne

2022-02-17 4394e4248455637ab7836756058ac872fdf4af10

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

@@ -1,19 +1,18 @@
package com.pollex.pam.service.dto;

import com.pollex.pam.enums.GenderEnum;
import com.pollex.pam.enums.SeniorityQueryEnum;

import java.util.List;

public class StrictQueryConsultantParam {

    private GenderEnum gender;
    private Number avgScore;
    private Float avgScore;
    private String status;
    private String area;
    private List<String> requirements;
    private String otherRequirement;
    private SeniorityQueryEnum seniority;
    private String seniority;
    private List<String> popularTags;
    private String otherPopularTags;

@@ -25,11 +24,11 @@
        this.gender = gender;
    }

    public Number getAvgScore() {
    public Float getAvgScore() {
        return avgScore;
    }

    public void setAvgScore(Number avgScore) {
    public void setAvgScore(Float avgScore) {
        this.avgScore = avgScore;
    }

@@ -65,11 +64,11 @@
        this.otherRequirement = otherRequirement;
    }

    public SeniorityQueryEnum getSeniority() {
    public String getSeniority() {
        return seniority;
    }

    public void setSeniority(SeniorityQueryEnum seniority) {
    public void setSeniority(String seniority) {
        this.seniority = seniority;
    }