From 1ebbd7d5c83cc81e5cf94aa4d2a87a4ecd8a03c3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 03 三月 2022 10:04:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberRoleDO.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 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 4ed1531..c3c0e7d 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
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
/**
@@ -87,4 +88,50 @@
*/
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