From b0b1e641a31a0494262187f97034807fc53515dd Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Mon, 28 Oct 2024 15:49:39 +0800
Subject: [PATCH] Merge branch 'gzdyh_test' into gzdyh_grid

---
 dyh-service/dyh-base/src/main/java/cn/huge/module/cust/constant/UserBaseConsts.java |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/cust/constant/UserBaseConsts.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/cust/constant/UserBaseConsts.java
index 4df6c42..a04a141 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/cust/constant/UserBaseConsts.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/cust/constant/UserBaseConsts.java
@@ -61,7 +61,7 @@
      * 是否参与自动调度,0:否,1:是
      */
     public static final int DISP_STATUS_0 = 0;
-    public static final int DISP_STATUS_2 = 1;
+    public static final int DISP_STATUS_1 = 1;
 
     /**
      * ========================================== 单位部门 ==========================================
@@ -76,16 +76,30 @@
     public static final int UNIT_GRADE_4 = 4;
 
     /**
-     * 组织类型,0:政法委,1:综治中心,2:直属部门,3:法院,4:行专业调委会,5:企事业调委会,6:演示测试,9:其他
+     * 组织类型,
+     * 调解组织类型(101:综治中心,102:直属部门,103:村居社区,104:行专业调委会,105:企事业调委会,106:演示测试),
+     * 行政组织类型(201:政法委,202:其他)
      */
-    public static final int UNIT_TYPE_0 = 0;
-    public static final int UNIT_TYPE_1 = 1;
-    public static final int UNIT_TYPE_2 = 2;
-    public static final int UNIT_TYPE_3 = 3;
-    public static final int UNIT_TYPE_4 = 4;
-    public static final int UNIT_TYPE_5 = 5;
-    public static final int UNIT_TYPE_6 = 6;
-    public static final int UNIT_TYPE_9 = 9;
+    public static final int UNIT_TYPE_101 = 101;
+    public static final int UNIT_TYPE_102 = 102;
+    public static final int UNIT_TYPE_103 = 103;
+    public static final int UNIT_TYPE_104 = 104;
+    public static final int UNIT_TYPE_105 = 105;
+    public static final int UNIT_TYPE_106 = 106;
+    public static final int UNIT_TYPE_201 = 201;
+    public static final int UNIT_TYPE_202 = 202;
+
+    /**
+     * 是否是法院,0:否,1:是
+     */
+    public static final int COURT_STATUS_0 = 0;
+    public static final int COURT_STATUS_1 = 1;
+
+    /**
+     * 组织职能,1:调解组织,2:行政组织
+     */
+    public static final int UNIT_FUN_1 = 1;
+    public static final int UNIT_FUN_2 = 2;
 }
 /**
  * -------------------_ooOoo_-------------------

--
Gitblit v1.8.0