diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml index a6cbdb7..94db7b2 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml @@ -37,11 +37,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - select user_id, name, age, sex, birth_date, education, political_affiliation, phone, avatar, salary_min, salary_max, area, status, del_flag, login_ip, login_date, create_by, create_time, update_by, update_time, remark,job_title_id,is_recommend,id_card,work_experience,is_company_user,dw_userid,region_code,phone_cipher,id_card_cipher,phone_encrypt,id_card_encrypt,user_type from app_user + select user_id, name, age, sex, birth_date, education, political_affiliation, phone, avatar, salary_min, salary_max, area, status, del_flag, login_ip, login_date, create_by, create_time, update_by, update_time, remark,job_title_id,is_recommend,id_card,work_experience,is_company_user,dw_userid,region_code,phone_cipher,id_card_cipher,phone_encrypt,id_card_encrypt,user_tag from app_user diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java index 2372f29..857f5cc 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java @@ -187,6 +187,6 @@ public class AppUser extends BaseEntity @ApiModelProperty("用户企业账号,显示未处理申请者条数字段") private Integer pendCount; - @ApiModelProperty("人员类型 0残疾人 1职业(技工)院校毕业生 2退役军人 3高校毕业生 4脱贫劳动力 5零就业家庭人员 6就业困难人员 7失业人员 8低保家庭") - private String userType; + @ApiModelProperty("人员标签 0残疾人 1职业(技工)院校毕业生 2退役军人 3高校毕业生 4脱贫劳动力 5零就业家庭人员 6就业困难人员 7失业人员 8低保家庭") + private String userTag; }