From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComVeteransPopulationDO.java | 413 +++++++++++++++++++++++++++--------------------------------
1 files changed, 189 insertions(+), 224 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComVeteransPopulationDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComVeteransPopulationDO.java
index b9bf5d7..1199878 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComVeteransPopulationDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComVeteransPopulationDO.java
@@ -1,13 +1,13 @@
package com.panzhihua.service_community.model.dos;
-import com.baomidou.mybatisplus.annotation.*;
-import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
-import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
-import lombok.Data;
-
import java.io.Serializable;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
/**
* @auther txb
@@ -23,336 +23,301 @@
private static final long serialVersionUID = 1L;
/**
- * 主键id
- */
+ * 主键id
+ */
@TableId(type = IdType.INPUT)
private Long id;
/**
- * 人口id
- */
+ * 人口id
+ */
private Long populationId;
/**
- * 街道id
- */
+ * 街道id
+ */
private Long streetId;
/**
- * 社区id
- */
- private Long communityId;
+ * 社区id
+ */
+ private Long communityId;
/**
- * 名字
- */
- private String name;
+ * 名字
+ */
+ private String name;
/**
- * 身份证号码
- */
+ * 身份证号码
+ */
@EncryptDecryptField
- private String cardNo;
+ private String cardNo;
/**
- * 联系电话
- */
- private String phone;
+ * 联系电话
+ */
+ private String phone;
/**
- * 人员状态：正常、失联、出国(取字典表）
- */
- private String personStatus;
+ * 人员状态：正常、失联、出国(取字典表）
+ */
+ private String personStatus;
/**
- * 机构
- */
- private String organization;
+ * 机构
+ */
+ private String organization;
/**
- * 照片
- */
- private String photo;
+ * 照片
+ */
+ private String photo;
/**
- * 户籍性质（1.城镇户口 2.农村户口）
- */
- private Integer regiterNature;
+ * 户籍性质
+ */
+ private String regiterNature;
/**
- * 入伍时间
- */
- private Date enlistDate;
+ * 入伍时间
+ */
+ private Date enlistDate;
/**
- * 退伍时间
- */
- private Date retireDate;
+ * 退伍时间
+ */
+ private Date retireDate;
/**
- * 人员类别
- */
- private String personCategory;
+ * 人员类别
+ */
+ private String personCategory;
/**
- * 住房状况
- */
- private String houseSituation;
+ * 住房状况
+ */
+ private String houseSituation;
/**
- * 住房状况其他
- */
- private String houseSituationOther;
+ * 住房状况其他
+ */
+ private String houseSituationOther;
/**
- * 建筑面积
- */
- private String buildArea;
+ * 建筑面积
+ */
+ private String buildArea;
/**
- * 现就业情况
- */
- private String employmentSituation;
+ * 现就业情况
+ */
+ private String employmentSituation;
/**
- * 在职情况类型
- */
- private String incumbencyType;
+ * 在职情况类型
+ */
+ private String incumbencyType;
/**
- * 现就业情况其他
- */
- private String employmentSituationOther;
+ * 现就业情况其他
+ */
+ private String employmentSituationOther;
/**
- * 养老保险
- */
- private String endowmentInsurance;
+ * 养老保险
+ */
+ private String endowmentInsurance;
/**
- * 医疗保险
- */
- private String medicalInsurance;
+ * 医疗保险
+ */
+ private String medicalInsurance;
/**
- * 现个人年收入（单位：元）
- */
- private String annualIncome;
+ * 现个人年收入（单位：元）
+ */
+ private String annualIncome;
/**
- * 父亲健康状况
- */
- private String fatherHealthy;
+ * 父亲健康状况
+ */
+ private String fatherHealthy;
/**
- * 母亲健康状况
- */
- private String motherHealthy;
+ * 母亲健康状况
+ */
+ private String motherHealthy;
/**
- * 配偶健康状况
- */
- private String spouseHealthy;
+ * 配偶健康状况
+ */
+ private String spouseHealthy;
/**
- * 儿子健康状况
- */
- private String sonHealthy;
+ * 儿子健康状况
+ */
+ private String sonHealthy;
/**
- * 女儿健康状况
- */
- private String daughterDealthy;
+ * 女儿健康状况
+ */
+ private String daughterDealthy;
/**
- * 主要困难
- */
- private String mainDifficulty;
+ * 主要困难
+ */
+ private String mainDifficulty;
/**
- * 其他困难
- */
- private String otherDifficulty;
+ * 其他困难
+ */
+ private String otherDifficulty;
/**
- * 主要诉求
- */
- private String mainDemand;
+ * 主要诉求
+ */
+ private String mainDemand;
/**
- * 主要诉求其他事项问题（手填）
- */
- private String mainDemandOther;
+ * 主要诉求其他事项问题（手填）
+ */
+ private String mainDemandOther;
/**
- * 需参加的学历培训
- */
- private String academicTraining;
+ * 需参加的学历培训
+ */
+ private String academicTraining;
/**
- * 是否已参加退役军人培训（政府性质）1.是 2.否
- */
- private Integer isVeteransTraining;
+ * 是否已参加退役军人培训（政府性质）1.是 2.否
+ */
+ private Integer isVeteransTraining;
/**
- * 入伍前学历
- */
- private String educationBeforeEnlistment;
+ * 入伍前学历
+ */
+ private String educationBeforeEnlistment;
/**
- * 再教育学历
- */
- private String reEducation;
+ * 再教育学历
+ */
+ private String reEducation;
/**
- * 所学专业
- */
- private String major;
+ * 所学专业
+ */
+ private String major;
/**
- * 所学专业其他
- */
- private String majorOther;
+ * 所学专业其他
+ */
+ private String majorOther;
/**
- * 曾从事行业（含现从事行业）
- */
- private String onceEngagedIndustry;
+ * 曾从事行业（含现从事行业）
+ */
+ private String onceEngagedIndustry;
/**
- * 曾从事行业（含现从事行业）其他（手填）
- */
- private String onceEngagedIndustryOther;
+ * 曾从事行业（含现从事行业）其他（手填）
+ */
+ private String onceEngagedIndustryOther;
/**
- * 意向就业地点
- */
- private String intendedPlaceOfEmployment;
+ * 意向就业地点
+ */
+ private String intendedPlaceOfEmployment;
/**
- * 意向就业地点其他地区（手填）
- */
- private String intendedPlaceOfEmploymentOther;
+ * 意向就业地点其他地区（手填）
+ */
+ private String intendedPlaceOfEmploymentOther;
/**
- * 待业期间的求职意向
- */
- private String unemploymedEngagedIndustry;
+ * 待业期间的求职意向
+ */
+ private String unemploymedEngagedIndustry;
/**
- * 待业期间的求职意向其他（手填）
- */
- private String unemploymedEngagedIndustryOther;
+ * 待业期间的求职意向其他（手填）
+ */
+ private String unemploymedEngagedIndustryOther;
/**
- * 是否有创业意愿（1.是 2.否）
- */
- private Integer isBusiness;
+ * 是否有创业意愿（1.是 2.否）
+ */
+ private Integer isBusiness;
/**
- * 创业意愿
- */
- private String businessDesire;
+ * 创业意愿
+ */
+ private String businessDesire;
/**
- * 备注
- */
- private String remark;
+ * 备注
+ */
+ private String remark;
/**
- * 填表单位
- */
- private String fillUnit;
+ * 填表单位
+ */
+ private String fillUnit;
/**
- * 填表人
- */
- private String fillPerson;
+ * 填表人
+ */
+ private String fillPerson;
/**
- * 填表人联系电话
- */
- private String fillPersonPhone;
+ * 填表人联系电话
+ */
+ private String fillPersonPhone;
/**
- * 创建时间
- */
+ * 创建时间
+ */
@TableField(fill = FieldFill.INSERT)
- private Date createAt;
+ private Date createAt;
/**
- * 创建用户
- */
- private Long createBy;
+ * 创建用户
+ */
+ private Long createBy;
/**
- * 修改时间
- */
+ * 修改时间
+ */
@TableField(fill = FieldFill.INSERT_UPDATE)
- private Date updateAt;
+ private Date updateAt;
/**
- * 修改用户
- */
- private Long updateBy;
+ * 修改用户
+ */
+ private Long updateBy;
-@Override
-public String toString() {
- return "ComVeteransPopulationDO{" +
- "id=" + id +
- ", populationId=" + populationId +
- ", streetId=" + streetId +
- ", communityId=" + communityId +
- ", name=" + name +
- ", cardNo=" + cardNo +
- ", phone=" + phone +
- ", personStatus=" + personStatus +
- ", organization=" + organization +
- ", photo=" + photo +
- ", regiterNature=" + regiterNature +
- ", enlistDate=" + enlistDate +
- ", retireDate=" + retireDate +
- ", personCategory=" + personCategory +
- ", houseSituation=" + houseSituation +
- ", houseSituationOther=" + houseSituationOther +
- ", buildArea=" + buildArea +
- ", employmentSituation=" + employmentSituation +
- ", incumbencyType=" + incumbencyType +
- ", employmentSituationOther=" + employmentSituationOther +
- ", endowmentInsurance=" + endowmentInsurance +
- ", medicalInsurance=" + medicalInsurance +
- ", annualIncome=" + annualIncome +
- ", fatherHealthy=" + fatherHealthy +
- ", motherHealthy=" + motherHealthy +
- ", spouseHealthy=" + spouseHealthy +
- ", sonHealthy=" + sonHealthy +
- ", daughterDealthy=" + daughterDealthy +
- ", mainDifficulty=" + mainDifficulty +
- ", otherDifficulty=" + otherDifficulty +
- ", mainDemand=" + mainDemand +
- ", mainDemandOther=" + mainDemandOther +
- ", academicTraining=" + academicTraining +
- ", isVeteransTraining=" + isVeteransTraining +
- ", educationBeforeEnlistment=" + educationBeforeEnlistment +
- ", reEducation=" + reEducation +
- ", major=" + major +
- ", majorOther=" + majorOther +
- ", onceEngagedIndustry=" + onceEngagedIndustry +
- ", onceEngagedIndustryOther=" + onceEngagedIndustryOther +
- ", intendedPlaceOfEmployment=" + intendedPlaceOfEmployment +
- ", intendedPlaceOfEmploymentOther=" + intendedPlaceOfEmploymentOther +
- ", unemploymedEngagedIndustry=" + unemploymedEngagedIndustry +
- ", unemploymedEngagedIndustryOther=" + unemploymedEngagedIndustryOther +
- ", isBusiness=" + isBusiness +
- ", businessDesire=" + businessDesire +
- ", remark=" + remark +
- ", fillUnit=" + fillUnit +
- ", fillPerson=" + fillPerson +
- ", fillPersonPhone=" + fillPersonPhone +
- ", createAt=" + createAt +
- ", createBy=" + createBy +
- ", updateAt=" + updateAt +
- ", updateBy=" + updateBy +
- "}";
- }
- }
\ No newline at end of file
+ @Override
+ public String toString() {
+ return "ComVeteransPopulationDO{" + "id=" + id + ", populationId=" + populationId + ", streetId=" + streetId
+ + ", communityId=" + communityId + ", name=" + name + ", cardNo=" + cardNo + ", phone=" + phone
+ + ", personStatus=" + personStatus + ", organization=" + organization + ", photo=" + photo
+ + ", regiterNature=" + regiterNature + ", enlistDate=" + enlistDate + ", retireDate=" + retireDate
+ + ", personCategory=" + personCategory + ", houseSituation=" + houseSituation + ", houseSituationOther="
+ + houseSituationOther + ", buildArea=" + buildArea + ", employmentSituation=" + employmentSituation
+ + ", incumbencyType=" + incumbencyType + ", employmentSituationOther=" + employmentSituationOther
+ + ", endowmentInsurance=" + endowmentInsurance + ", medicalInsurance=" + medicalInsurance
+ + ", annualIncome=" + annualIncome + ", fatherHealthy=" + fatherHealthy + ", motherHealthy=" + motherHealthy
+ + ", spouseHealthy=" + spouseHealthy + ", sonHealthy=" + sonHealthy + ", daughterDealthy=" + daughterDealthy
+ + ", mainDifficulty=" + mainDifficulty + ", otherDifficulty=" + otherDifficulty + ", mainDemand="
+ + mainDemand + ", mainDemandOther=" + mainDemandOther + ", academicTraining=" + academicTraining
+ + ", isVeteransTraining=" + isVeteransTraining + ", educationBeforeEnlistment=" + educationBeforeEnlistment
+ + ", reEducation=" + reEducation + ", major=" + major + ", majorOther=" + majorOther
+ + ", onceEngagedIndustry=" + onceEngagedIndustry + ", onceEngagedIndustryOther=" + onceEngagedIndustryOther
+ + ", intendedPlaceOfEmployment=" + intendedPlaceOfEmployment + ", intendedPlaceOfEmploymentOther="
+ + intendedPlaceOfEmploymentOther + ", unemploymedEngagedIndustry=" + unemploymedEngagedIndustry
+ + ", unemploymedEngagedIndustryOther=" + unemploymedEngagedIndustryOther + ", isBusiness=" + isBusiness
+ + ", businessDesire=" + businessDesire + ", remark=" + remark + ", fillUnit=" + fillUnit + ", fillPerson="
+ + fillPerson + ", fillPersonPhone=" + fillPersonPhone + ", createAt=" + createAt + ", createBy=" + createBy
+ + ", updateAt=" + updateAt + ", updateBy=" + updateBy + "}";
+ }
+}
\ No newline at end of file
--
Gitblit v1.7.1