From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberRoleDO.java |  104 +++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 79 insertions(+), 25 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberRoleDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberRoleDO.java
index 82cf64e..600bf5e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberRoleDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberRoleDO.java
@@ -1,12 +1,14 @@
 package com.panzhihua.service_dangjian.model.dos;
 
+import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 
-import java.io.Serializable;
-import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -23,61 +25,113 @@
     /**
      * id
      */
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
      * 电话
      */
-     private String phone;
+    private String phone;
 
-     /**
+    /**
      * 是否注册
      */
-     private Integer isReg;
+    private Integer isReg;
 
-     /**
+    /**
      * 姓名
      */
-     private String name;
+    private String name;
 
-     /**
+    /**
      * 性别
      */
-     private Integer sex;
+    private Integer sex;
 
-     /**
+    /**
      * 出生日期
      */
-     private Date birthTime;
+    private Date birthTime;
 
-     /**
+    /**
      * 职位
      */
-     private String position;
+    private String position;
 
-     /**
+    /**
+     * 职位2
+     */
+    private String positionTwo;
+
+    /**
      * 岗位职责
      */
-     private String jobResponsibilities;
+    private String jobResponsibilities;
 
-     /**
+    /**
      * 头像图片路径
      */
-     private String photoPath;
+    private String photoPath;
 
-     /**
+    /**
      * 创建时间
      */
-     private Date createAt;
+    private Date createAt;
 
-     /**
+    /**
      * 修改时间
      */
-     private Date updateAt;
+    private Date updateAt;
 
-     /**
+    /**
      * 社区id
      */
-     private Long communityId;
+    private Long communityId;
+
+    /**
+     * 党委标签（1.社区党委 2.区域党委委员）
+     */
+    private Integer type;
+
+    /**
+     * 入党时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date joinTime;
+
+    /**
+     * 转正时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date employmentTime;
+
+    /**
+     * 职能
+     */
+    private String function;
+
+    /**
+     * 特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）
+     */
+    private Integer specialtyCategory;
+
+    /**
+     * 特长描述
+     */
+    private String specialtyName;
+
+    /**
+     * 报道单位id
+     */
+    private Long checkUnitId;
+
+    /**
+     * 负责党组织id
+     */
+    private Long orgId;
+
+    /**
+     * 身份证
+     */
+    private String idCard;
 }

--
Gitblit v1.7.1