diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index e71ba1f..e0dd740 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -190,11 +190,6 @@ public class SysUser extends BaseEntity @Excel(name = "学历") private String graduate; - /** 生效时间 */ - private String startdate; - - /** 失效时间 */ - private String enddate; /** 健康状况 */ private String helthy; @@ -209,7 +204,7 @@ public class SysUser extends BaseEntity private String examineuser; /** 是否持有护照和港澳通行证 */ - @Excel(name = "是否持有护照和港澳通行证") + @Excel(name = "是否持有护照和港澳通行证",readConverterExp = "1=是,0=否") private String havePassport; /** 保密协议书 */ @@ -227,9 +222,18 @@ public class SysUser extends BaseEntity } /** 是否出入境备案 */ - @Excel(name = "是否具有出入境备案") + @Excel(name = "是否具有出入境备案",readConverterExp = "1=是,0=否") private String entryexitFiling; + + /** 生效时间 */ + @Excel(name = "生效时间", width = 30, dateFormat = "yyyy-MM-dd") + private String startdate; + + /** 失效时间 */ + @Excel(name = "失效时间", width = 30, dateFormat = "yyyy-MM-dd") + private String enddate; + public String getHavePassport() { return havePassport; }