Merge remote-tracking branch 'origin/master'

src/main/java/com/zzsn/leaderbase/entity/CharacterBasicInfo.java

+package com.zzsn.leaderbase.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 人物基本信息表
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("character_basic_info")
+public class CharacterBasicInfo {
+  private static final long serialVersionUID = 1L;
+
+  //主键
+  private String id;
+  //人物id
+  private String uid;
+  //人物名称
+  private String name;
+  //性别
+  private String sex;
+  //出生地
+  private String birthplace;
+  //出生日期
+  private Date birthday;
+  //籍贯
+  private String nativePlace;
+  //毕业院校
+  private String school;
+  //专业
+  private String speciality;
+  //学历
+  private String education;
+  //职业
+  private String expertOccupation;
+  //头像
+  private String headSculpture;
+  //个人简历 简介
+  private String biographicalNotes;
+  //分类类型:领导人、专家、高管
+  private String category;
+  //任职经历，每一条任职经历用 \n（换行）分割
+  private String awardRecords;
+  //社会兼职，每一条用 \n（换行） 分割
+  private String partTimeJob;
+  //研究领域
+  private String researchField;
+  //荣誉评价
+  private String evaluate;
+  //创建人
+  private String createBy;
+  //创建时间
+  private Date createTime;
+  //更新人
+  private String updateBy;
+  //更新时间
+  private Date updateTime;
+  //启停状态  1启 0停
+  private Long status;
+
+}

src/main/java/com/zzsn/leaderbase/entity/CharacterBasicInfoHistory.java

+package com.zzsn.leaderbase.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 人物基本信息修改历史记录表
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("character_basic_info_history")
+public class CharacterBasicInfoHistory {
+  private static final long serialVersionUID = 1L;
+
+  //主键
+  private String id;
+  //人物id
+  private String uid;
+  //人物名称
+  private String name;
+  //性别
+  private String sex;
+  //出生地
+  private String birthplace;
+  //出生日期
+  private Date birthday;
+  //籍贯
+  private String nativePlace;
+  //毕业院校
+  private String school;
+  //专业
+  private String speciality;
+  //学历
+  private String education;
+  //职业
+  private String expertOccupation;
+  //头像
+  private String headSculpture;
+  //个人简历 简介
+  private String biographicalNotes;
+  //  分类类型:领导人、专家、高管
+  private String category;
+  //  任职经历，每一条任职经历用 （换行）分割
+  private String awardRecords;
+  //  社会兼职，每一条用 （换行） 分割
+  private String partTimeJob;
+  //研究领域
+  private String researchField;
+  //荣誉评价
+  private String evaluate;
+  //创建人
+  private String createBy;
+  //创建时间
+  private Date createTime;
+  //更新人
+  private String updateBy;
+  //更新时间
+  private Date updateTime;
+  //启停状态  1启 0停
+  private Long status;
+
+
+}

src/main/java/com/zzsn/leaderbase/entity/CharacterChangeInfo.java

+package com.zzsn.leaderbase.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 人物变更信息表
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("character_change_info")
+public class CharacterChangeInfo {
+  private static final long serialVersionUID = 1L;
+
+  //  主键
+  private String id;
+  //关联人物id
+  private String uid;
+  //人物名称
+  private String name;
+  //原部门 原单位 原企业
+  private String company;
+  //原职务
+  private String oldDuties;
+  //部门 单位 企业(现)
+  private String department;
+  //职务(现)
+  private String workplace;
+  //任职时间
+  private Date takeOfficeTime;
+  //任职状态
+  private String takeOfficeStatus;
+  //变更链接
+  private String changeUrl;
+  //职务变更时间
+  private Date dutiesUpdateTime;
+  //职务变更原因
+  private String dutiesUpdateReason;
+  //是否审核  1是 0否
+  private Long checkstatus;
+  //是否审核通过 0未通过 1通过 2待定
+  private Long check;
+  //关联资讯id
+  private String articleId;
+  //关联资讯标题
+  private String articleTitle;
+  //变更描述
+  private String updateDesc;
+  //创建人
+  private String createBy;
+  //创建时间
+  private Date createTime;
+  //更新人
+  private String updateBy;
+  //更新时间
+  private Date updateTime;
+  //启停状态  1启 0停
+  private Long status;
+
+}

src/main/java/com/zzsn/leaderbase/entity/CharacterChangeInfoHistory.java

+package com.zzsn.leaderbase.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 人物变更历史记录表
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("character_change_info_history")
+public class CharacterChangeInfoHistory {
+  private static final long serialVersionUID = 1L;
+
+  //主键
+  private String id;
+  //关联人物id
+  private String uid;
+  //人物名称
+  private String name;
+  //原部门 原单位 原企业
+  private String company;
+  //原职务
+  private String oldDuties;
+  //部门 单位 企业(现)
+  private String department;
+  //职务(现)
+  private String workplace;
+  //任职时间
+  private Date takeOfficeTime;
+  //任职状态
+  private String takeOfficeStatus;
+  //变更链接
+  private String changeUrl;
+  //职务变更时间
+  private Date dutiesUpdateTime;
+  //职务变更原因
+  private String dutiesUpdateReason;
+  //是否审核  1是 0否
+  private Long checkstatus;
+  //是否审核通过 0未通过 1通过 2待定
+  private Long check;
+  //关联资讯id
+  private String articleId;
+  //关联资讯标题
+  private String articleTitle;
+  //变更描述
+  private String updateDesc;
+  //创建人
+  private String createBy;
+  //创建时间
+  private Date createTime;
+  //更新人
+  private String updateBy;
+  //更新时间
+  private Date updateTime;
+  //启停状态  1启 0停
+  private Long status;
+
+}