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

zf

2023-08-30 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b

 src/main/java/com/gk/hotwork/Domain/UserInfo.java

@@ -106,7 +106,7 @@
    private Byte isdel;

    /**
     * # 1超级管理员,2管理员,3普通用户
     * # 1超级管理员,2监管用户,3企业用户,4专家用户
     **/
    private Integer type;

@@ -178,6 +178,73 @@

    private String slice;

    private String province;

    private String city;

    private String county;

    /**
     * 行政级别 1-省（自治区） 2-地（市、州） 3-区/县
     */
    private Integer executiveLevel;
    /**
     * 专业方向id
     */
    private Long specialityId;
    /**
     * 专业等级（1初级，2中级，3高级，4其他）
     */
    private Integer professionalLevel;

    public Long getSpecialityId() {
        return specialityId;
    }

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

    public Integer getProfessionalLevel() {
        return professionalLevel;
    }

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

    public Integer getExecutiveLevel() {
        return executiveLevel;
    }

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

    public String getProvince() {
        return province;
    }

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

    public String getCity() {
        return city;
    }

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

    public String getCounty() {
        return county;
    }

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

    public Long getRoleid() {
        return roleid;
    }