Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSyst...

郑永安

2023-07-24 0645153dfa233b51a749db73f9bd5a8c5127c595

 src/main/java/com/gk/hotwork/Domain/Vo/UserVo.java

@@ -1,9 +1,6 @@
package com.gk.hotwork.Domain.Vo;

import com.gk.hotwork.Domain.AuthorizationInfo;
import com.gk.hotwork.Domain.CompanyInfo;
import com.gk.hotwork.Domain.ExamScoreInfo;
import com.gk.hotwork.Domain.UserInfo;
import com.gk.hotwork.Domain.*;

import java.util.Date;
import java.util.List;
@@ -42,8 +39,132 @@

    private String roleSign;

    private String province;

    private String city;

    private String county;

    /**
     * 行政级别 1-省（自治区） 2-地（市、州） 3-区/县
     */
    private Integer executiveLevel;
    /**
     * 专业方向id
     */
    private Long specialityId;

    private String specialityName;
    /**
     * 专业等级（1初级，2中级，3高级，4其他）
     */
    private Integer professionalLevel;

    private String company;

    private Long companyid;

    @Override
    public Long getCompanyid() {
        return companyid;
    }

    @Override
    public void setCompanyid(Long companyid) {
        this.companyid = companyid;
    }

    public String getSpecialityName() {
        return specialityName;
    }

    public void setSpecialityName(String specialityName) {
        this.specialityName = specialityName;
    }

    @Override
    public String getCompany() {
        return company;
    }

    @Override
    public void setCompany(String company) {
        this.company = company;
    }


    private CompanyInfo companyInfo;

    private SpecialityInfo specialityInfo;

    @Override
    public String getProvince() {
        return province;
    }

    @Override
    public void setProvince(String province) {
        this.province = province;
    }

    @Override
    public String getCity() {
        return city;
    }

    @Override
    public void setCity(String city) {
        this.city = city;
    }

    @Override
    public String getCounty() {
        return county;
    }

    @Override
    public void setCounty(String county) {
        this.county = county;
    }

    @Override
    public Long getSpecialityId() {
        return specialityId;
    }

    @Override
    public void setSpecialityId(Long specialityId) {
        this.specialityId = specialityId;
    }

    @Override
    public Integer getProfessionalLevel() {
        return professionalLevel;
    }

    @Override
    public void setProfessionalLevel(Integer professionalLevel) {
        this.professionalLevel = professionalLevel;
    }

    @Override
    public Integer getExecutiveLevel() {
        return executiveLevel;
    }

    @Override
    public void setExecutiveLevel(Integer executiveLevel) {
        this.executiveLevel = executiveLevel;
    }

    public SpecialityInfo getSpecialityInfo() {
        return specialityInfo;
    }

    public void setSpecialityInfo(SpecialityInfo specialityInfo) {
        this.specialityInfo = specialityInfo;
    }

    public String getToken() {
        return token;
    }