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/ComPbMemberDO.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java
index bad403d..934921e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java
@@ -86,4 +86,60 @@
      */
     private String refuseReason;
 
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 党员类型(1.预备党员 2.正式党员)
+     */
+    private Integer type;
+
+    /**
+     * 职位
+     */
+    private String position;
+
+    /**
+     * 报道单位id
+     */
+    private Long checkUnitId;
+
+    /**
+     * 职能
+     */
+    private String function;
+
+    /**
+     * 特长类别(1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他)
+     */
+    private Integer specialtyCategory;
+
+    /**
+     * 特长描述
+     */
+    private String specialtyName;
+
+    /**
+     * 职位2
+     */
+    private String positionTwo;
+
+    /**
+     * 党员审查结果 0待审核 1 审核通过 3审核失败
+     */
+    public interface AuditResult{
+        int DSH = 0;
+        int SHTG = 1;
+        int SHBH = 3;
+    }
+
+    /**
+     * 党员类型(1.预备党员 2.正式党员)
+     */
+    public interface Type{
+        int YBDY = 1;
+        int ZSDY = 2;
+    }
 }

--
Gitblit v1.7.1