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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbOrgDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbOrgDO.java
index c0ac05f..b9d275a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbOrgDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbOrgDO.java
@@ -47,4 +47,83 @@
      * 状态 1 启用 2 禁用
      */
     private Integer status;
+
+    /**
+     * 组织类别(1.基层党委 2.二级基层党委 3.党总支 4.党支部 5.党小组)
+     */
+    private Integer type;
+    /**
+     * 组织隶属(1.乡镇 2.机关 3.域市街道 3.域市社区(居委会) 4.农村社区居委会 5.建制村 6.国有经济控制 7.集体经济控制 8.非公有经济控制 9.事业单位 10.社会组织 11.其他)
+     */
+    private Integer subjection;
+    /**
+     * 小区id
+     */
+    private Long areaId;
+    /**
+     * 楼栋id
+     */
+    private Long buildId;
+    /**
+     * 组织地址
+     */
+    private String address;
+    /**
+     * 经度
+     */
+    private String longitude;
+    /**
+     * 纬度
+     */
+    private String latitude;
+    /**
+     * 一级id
+     */
+    private Long oneId;
+    /**
+     * 二级id
+     */
+    private Long twoId;
+    /**
+     * 三级id
+     */
+    private Long thirdId;
+    /**
+     * 四级id
+     */
+    private Long fourId;
+    /**
+     * 五级id
+     */
+    private Long fiveId;
+
+    /**
+     * 组织类别(1.基层党委 2.二级基层党委 3.党总支 4.党支部 5.党小组)
+     */
+    public interface Type{
+        int JCDW = 1;
+        int EJJCDW = 2;
+        int DZZ = 3;
+        int DZB = 4;
+        int DXZ = 5;
+    }
+
+    /**
+     * 组织隶属(1.乡镇 2.机关 3.域市街道 4.域市社区(居委会) 5.农村社区居委会 6.建制村 7.国有经济控制 8.集体经济控制
+     * 9.非公有经济控制 10.事业单位 11.社会组织 12.其他)
+     */
+    public interface Subjection{
+        int XZ = 1;
+        int JG = 2;
+        int YSJD = 3;
+        int YSSQ = 4;
+        int NCSQJWH = 5;
+        int JZC = 6;
+        int GYJJKZ = 7;
+        int JTJJKZ = 8;
+        int FGYJJKZ = 9;
+        int SYDW = 10;
+        int SHZZ = 11;
+        int QT = 12;
+    }
 }

--
Gitblit v1.7.1