From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/java/com/ots/project/exam/domain/SysUserExtend.java | 167 ++++++-------------------------------------------------
1 files changed, 19 insertions(+), 148 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/domain/SysUserExtend.java b/src/main/java/com/ots/project/exam/domain/SysUserExtend.java
index d449279..c45a177 100644
--- a/src/main/java/com/ots/project/exam/domain/SysUserExtend.java
+++ b/src/main/java/com/ots/project/exam/domain/SysUserExtend.java
@@ -1,134 +1,69 @@
package com.ots.project.exam.domain;
-
import com.ots.framework.aspectj.lang.annotation.Excel;
import com.ots.framework.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.springframework.web.multipart.MultipartFile;
-
import java.util.Date;
-/**
- * 鐢ㄦ埛淇℃伅鎵╁睍瀵硅薄 sys_user_extend
- *
- * @author ots
- * @date 2019-11-20
- */
public class SysUserExtend extends BaseEntity {
private static final long serialVersionUID = 1L;
-
- /**
- * 鐢ㄦ埛缂栫爜
- */
+
private Long userId;
-
- /**
- * 鍒嗛攢鍟嗙紪鐮�
- */
+
private Long parentUserId;
-
private Long parentUserTempId;
-
- /**
- * 娉曚汉
- */
+
@Excel(name = "娉曚汉")
private String legalPerson;
-
- /**
- * 鑱旂郴鍦板潃
- */
+
@Excel(name = "鑱旂郴鍦板潃")
private String address;
-
- /**
- * 鍚堝悓鍦板潃
- */
+
@Excel(name = "鍚堝悓鍦板潃")
private String contractText;
-
- /**
- * 鍚堝悓鑼冨洿
- */
+
@Excel(name = "鍚堝悓鑼冨洿")
private String contractScope;
-
- /**
- * 鐢熸晥鏃堕棿
- */
+
@Excel(name = "鐢熸晥鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date effectTime;
-
- /**
- * 鍚堜綔鏈熼檺
- */
+
@Excel(name = "鍚堜綔鏈熼檺", width = 30, dateFormat = "yyyy-MM-dd")
private Date invalidTime;
-
- /**
- * 鍏徃瑙勬ā
- */
+
@Excel(name = "鍏徃瑙勬ā")
private Long companySize;
-
- /**
- * 钀ヤ笟鎵х収淇℃伅
- */
+
@Excel(name = "钀ヤ笟鎵х収淇℃伅")
private String businessLicense;
-
- /**
- * 涓氬姟缁忕悊
- */
+
@Excel(name = "涓氬姟缁忕悊")
private String businessManager;
-
- /**
- * 浼佷笟LOGO
- */
+
@Excel(name = "浼佷笟LOGO")
private String businessLogo;
-
- /**
- * 鍙敤娴嬭瘯浜烘暟
- */
+
@Excel(name = "鍙敤娴嬭瘯浜烘暟")
private Long testNum;
-
- /**
- * HR閭
- */
+
@Excel(name = "HR閭")
private String hrEmail;
-
- /**
- * 娴嬭瘯鑰呮槸鍚︽敹鍒版姤鍛婏紙0鍚� 1鏄級
- */
+
@Excel(name = "娴嬭瘯鑰呮槸鍚︽敹鍒版姤鍛�", readConverterExp = "0=鍚�,1=鏄�")
private String sendReport;
-
- /**
- * 閭欢鍐呭
- */
+
@Excel(name = "閭欢鍐呭")
private String mailContent;
-
- /**
- * HR鎺ュ彈鎶ュ憡绫诲瀷
- */
+
@Excel(name = "HR鎺ュ彈鎶ュ憡绫诲瀷")
private String hrReportType;
-
- /**
- * 璇█绫诲瀷
- */
+
@Excel(name = "鎶ュ憡璇█绫诲瀷")
private String langType;
-
private MultipartFile businessLicenseFile;
private MultipartFile contractTextFile;
private MultipartFile businessLogoFile;
-
private String userType;
private String userName;
private String loginName;
@@ -136,252 +71,188 @@
private String phonenumber;
private String contactPerson;
private String contactEmail;
-
public String getContactPerson() {
return contactPerson;
}
-
public void setContactPerson(String contactPerson) {
this.contactPerson = contactPerson;
}
-
public String getContactEmail() {
return contactEmail;
}
-
public void setContactEmail(String contactEmail) {
this.contactEmail = contactEmail;
}
-
public Long getParentUserTempId() {
return parentUserTempId;
}
-
public void setParentUserTempId(Long parentUserTempId) {
this.parentUserTempId = parentUserTempId;
}
-
- /**
- * 鏄惁涓轰竴绾т緵搴斿晢
- */
+
private String firstLevel;
-
public String getFirstLevel() {
return firstLevel;
}
-
public void setFirstLevel(String firstLevel) {
this.firstLevel = firstLevel;
}
-
public String getPhonenumber() {
return phonenumber;
}
-
public void setPhonenumber(String phonenumber) {
this.phonenumber = phonenumber;
}
-
public String getUserType() {
return userType;
}
-
public void setUserType(String userType) {
this.userType = userType;
}
-
public String getUserName() {
return userName;
}
-
public void setUserName(String userName) {
this.userName = userName;
}
-
public String getLoginName() {
return loginName;
}
-
public void setLoginName(String loginName) {
this.loginName = loginName;
}
-
public String getPassword() {
return password;
}
-
public void setPassword(String password) {
this.password = password;
}
-
public void setUserId(Long userId) {
this.userId = userId;
}
-
public Long getUserId() {
return userId;
}
-
public void setLegalPerson(String legalPerson) {
this.legalPerson = legalPerson;
}
-
public String getLegalPerson() {
return legalPerson;
}
-
public void setAddress(String address) {
this.address = address;
}
-
public String getAddress() {
return address;
}
-
public void setContractText(String contractText) {
this.contractText = contractText;
}
-
public String getContractText() {
return contractText;
}
-
public void setContractScope(String contractScope) {
this.contractScope = contractScope;
}
-
public String getContractScope() {
return contractScope;
}
-
public void setEffectTime(Date effectTime) {
this.effectTime = effectTime;
}
-
public Date getEffectTime() {
return effectTime;
}
-
public void setInvalidTime(Date invalidTime) {
this.invalidTime = invalidTime;
}
-
public Date getInvalidTime() {
return invalidTime;
}
-
public void setCompanySize(Long companySize) {
this.companySize = companySize;
}
-
public Long getCompanySize() {
return companySize;
}
-
public void setBusinessLicense(String businessLicense) {
this.businessLicense = businessLicense;
}
-
public String getBusinessLicense() {
return businessLicense;
}
-
public void setBusinessManager(String businessManager) {
this.businessManager = businessManager;
}
-
public String getBusinessManager() {
return businessManager;
}
-
public void setBusinessLogo(String businessLogo) {
this.businessLogo = businessLogo;
}
-
public String getBusinessLogo() {
return businessLogo;
}
-
public void setTestNum(Long testNum) {
this.testNum = testNum;
}
-
public Long getTestNum() {
return testNum;
}
-
public void setHrEmail(String hrEmail) {
this.hrEmail = hrEmail;
}
-
public String getHrEmail() {
return hrEmail;
}
-
public void setSendReport(String sendReport) {
this.sendReport = sendReport;
}
-
public String getSendReport() {
return sendReport;
}
-
public void setMailContent(String mailContent) {
this.mailContent = mailContent;
}
-
public String getMailContent() {
return mailContent;
}
-
public void setHrReportType(String hrReportType) {
this.hrReportType = hrReportType;
}
-
public String getHrReportType() {
return hrReportType;
}
-
public void setLangType(String langType) {
this.langType = langType;
}
-
public String getLangType() {
return langType;
}
-
public MultipartFile getBusinessLicenseFile() {
return businessLicenseFile;
}
-
public void setBusinessLicenseFile(MultipartFile businessLicenseFile) {
this.businessLicenseFile = businessLicenseFile;
}
-
public Long getParentUserId() {
return parentUserId;
}
-
public void setParentUserId(Long parentUserId) {
this.parentUserId = parentUserId;
}
-
public MultipartFile getContractTextFile() {
return contractTextFile;
}
-
public void setContractTextFile(MultipartFile contractTextFile) {
this.contractTextFile = contractTextFile;
}
-
public MultipartFile getBusinessLogoFile() {
return businessLogoFile;
}
-
public void setBusinessLogoFile(MultipartFile businessLogoFile) {
this.businessLogoFile = businessLogoFile;
}
-
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.9.1