diff --git a/FengHuang/target/classes/Sql/organization.sql b/FengHuang/target/classes/Sql/organization.sql
index fac60d9..09c0c27 100644
--- a/FengHuang/target/classes/Sql/organization.sql
+++ b/FengHuang/target/classes/Sql/organization.sql
@@ -84,15 +84,7 @@
 
   -- 组织机构部门树
   #sql("getOrgTreeByBureauId")
-<<<<<<< HEAD
-<<<<<<< HEAD
     select org_id,org_name,(case when bureau_id=org_id then '-1' else parent_id end) as parent_id,bureau_id,school_type_id,department_type_id from t_base_organization where bureau_id=?
-=======
-    select org_id,org_name,(case when bureau_id=org_id then '-1' else parent_id end) as parent_id,bureau_id,department_type_id from t_base_organization where bureau_id=?
->>>>>>> 32b4533146dc66248f1e7fdf81fe41bff017b94c
-=======
-    select org_id,org_name,(case when bureau_id=org_id then '-1' else parent_id end) as parent_id,bureau_id,school_type_id,department_type_id from t_base_organization where bureau_id=?
->>>>>>> c1b567521dc3952024a8dff25a3cd953d8e7ce2a
       and b_use=1 order by sort_id,update_ts
   #end