diff --git a/evo-admin/src/main/java/com/evo/system/domain/SysStaff.java b/evo-admin/src/main/java/com/evo/system/domain/SysStaff.java index 6837f3d..f3bde75 100644 --- a/evo-admin/src/main/java/com/evo/system/domain/SysStaff.java +++ b/evo-admin/src/main/java/com/evo/system/domain/SysStaff.java @@ -1,6 +1,9 @@ package com.evo.system.domain; import java.util.Date; +import java.util.List; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -24,6 +27,7 @@ public class SysStaff extends BaseEntity /** 部门ID */ private Long deptId; @Excel(name = "部门") + @TableField(exist = false) private String deptName; /** 编号 */ @Excel(name = "编号") @@ -173,6 +177,7 @@ public class SysStaff extends BaseEntity /*** * 文件Id */ + @TableField(exist = false) private Long fileId; /*** * 文件位置 @@ -182,49 +187,10 @@ public class SysStaff extends BaseEntity * 打卡位置 */ private String timeClock; - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("userId", getUserId()) - .append("deptId", getDeptId()) - .append("code", getCode()) - .append("name", getName()) - .append("idCard", getIdCard()) - .append("sex", getSex()) - .append("age", getAge()) - .append("phone", getPhone()) - .append("address", getAddress()) - .append("level", getLevel()) - .append("major", getMajor()) - .append("school", getSchool()) - .append("bankNumber", getBankNumber()) - .append("bank", getBank()) - .append("employmentDate", getEmploymentDate()) - .append("experience", getExperience()) - .append("workerTerm", getWorkerTerm()) - .append("regularDate", getRegularDate()) - .append("quitDate", getQuitDate()) - .append("contractStart", getContractStart()) - .append("contractEnd", getContractEnd()) - .append("contractType", getContractType()) - .append("socialType", getSocialType()) - .append("seniority", getSeniority()) - .append("isOvertimePay", getIsOvertimePay()) - .append("zsFlag", getZsFlag()) - .append("secrecy", getSecrecy()) - .append("injury", getInjury()) - .append("insurance", getInsurance()) - .append("introducer", getIntroducer()) - .append("clockIn", getClockIn()) - .append("status", getStatus()) - .append("wagesRatioDate", getWagesRatioDate()) - .append("remarks", getRemarks()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } + /*** + * 享有补贴 + */ + private String subsidys; + @TableField(exist = false) + private List subsidyList; }