diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.11__del_social_org.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.11__del_social_org.sql
new file mode 100644
index 0000000000..ae315be35c
--- /dev/null
+++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.11__del_social_org.sql
@@ -0,0 +1,7 @@
+UPDATE sys_dict_data
+SET DEL_FLAG = '1',
+UPDATED_BY = 'yinzuomei',
+UPDATED_TIME = NOW(),
+remark = '2022.02.21删除社会组织功能，改用联建单位两新组织'
+WHERE
+	dict_value = 'social_org';
\ No newline at end of file
diff --git a/epmet-admin/epmet-admin-server/src/main/resources/mapper/SysDictDataDao.xml b/epmet-admin/epmet-admin-server/src/main/resources/mapper/SysDictDataDao.xml
index ff1273d4ae..d7ea8fa27b 100644
--- a/epmet-admin/epmet-admin-server/src/main/resources/mapper/SysDictDataDao.xml
+++ b/epmet-admin/epmet-admin-server/src/main/resources/mapper/SysDictDataDao.xml
@@ -14,8 +14,8 @@
         FROM
             sys_dict_data a
         INNER JOIN sys_dict_type b ON a.dict_type_id = b.id
-        WHERE
-            b.dict_type = #{dictType}
+        WHERE a.del_flag='0'
+            and b.dict_type = #{dictType}
         ORDER BY
             a.sort ASC
     </select>
@@ -27,8 +27,8 @@
         FROM
             sys_dict_data a
         INNER JOIN sys_dict_type b ON a.dict_type_id = b.id
-        WHERE
-            b.dict_type = #{dictType}
+        WHERE a.del_flag='0'
+            and b.dict_type = #{dictType}
         ORDER BY
             a.sort asc
     </select>
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java
index a3600b2e0e..7acfd64627 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java
@@ -62,6 +62,11 @@ public class CustomerGridDTO implements Serializable {
      */
     private String latitude;
 
+    /**
+     * 中心点位位置
+     */
+    private String centerAddress;
+
     /**
      * 所属地区码（所属组织地区码）
      */
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java
index 7a5e6b5537..575a498d57 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java
@@ -85,4 +85,22 @@ public class AddAgencyFormDTO implements Serializable {
     @Length(max=30,message = "区县级机关名称不能超过30个字")
     private String district;
 
+    //02.21新增需求：小程序工作端添加组织增加中心点位置入口，点击进入地图选择点位，可以搜索，中心点为必填
+    //该接口为通用接口，后端暂时先不限制必填。由前端控制
+    /**
+     * 中心位置经度
+     */
+    // @NotBlank(message = "请选择网格中心点位", groups = AddGridFormDTO.AddGrid.class)
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    // @NotBlank(message = "请选择网格中心点位", groups = AddGridFormDTO.AddGrid.class)
+    private String latitude;
+
+    /**
+     * 中心点位位置
+     */
+    private String centerAddress;
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java
index 50ee7a010c..0cbb5c1ab5 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java
@@ -99,4 +99,23 @@ public class AddAgencyV2FormDTO implements Serializable {
      * 联系电话
      */
     private String mobile;
+
+    //02.21新增需求：小程序工作端添加组织增加中心点位置入口，点击进入地图选择点位，可以搜索，中心点为必填
+    //该接口为通用接口，后端暂时先不限制必填。由前端控制
+    /**
+     * 中心位置经度
+     */
+    // @NotBlank(message = "请选择网格中心点位", groups = AddGridFormDTO.AddGrid.class)
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    // @NotBlank(message = "请选择网格中心点位", groups = AddGridFormDTO.AddGrid.class)
+    private String latitude;
+
+    /**
+     * 中心点位位置
+     */
+    private String centerAddress;
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddGridFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddGridFormDTO.java
index 965f8b5fc6..9eab6ce157 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddGridFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddGridFormDTO.java
@@ -51,4 +51,22 @@ public class AddGridFormDTO implements Serializable {
      */
     private String mobile;
 
+    //02.21新增需求：小程序工作端添加组织增加中心点位置入口，点击进入地图选择点位，可以搜索，中心点为必填
+    //该接口为通用接口，后端暂时先不限制必填。由前端控制
+    /**
+     * 中心位置经度
+     */
+    // @NotBlank(message = "请选择网格中心点位", groups = AddGridFormDTO.AddGrid.class)
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    // @NotBlank(message = "请选择网格中心点位", groups = AddGridFormDTO.AddGrid.class)
+    private String latitude;
+
+    /**
+     * 中心点位位置
+     */
+    private String centerAddress;
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java
index 7b3ff97ed8..7473027fde 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java
@@ -89,4 +89,23 @@ public class EditAgencyFormDTO implements Serializable {
 
     @NotBlank(message = "组织级别不能为空;社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province", groups = AddAgencyV2FormDTO.AddUserInternalGroup.class)
     private String level;
+
+    //02.21新增需求：小程序工作端添加组织增加中心点位置入口，点击进入地图选择点位，可以搜索，中心点为必填
+    //该接口为通用接口，后端暂时先不限制必填。由前端控制
+    /**
+     * 中心位置经度
+     */
+    // @NotBlank(message = "请选择网格中心点位", groups = AddGridFormDTO.AddGrid.class)
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    // @NotBlank(message = "请选择网格中心点位", groups = AddGridFormDTO.AddGrid.class)
+    private String latitude;
+
+    /**
+     * 中心点位位置
+     */
+    private String centerAddress;
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java
index 1c42608fd8..8774da4f99 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java
@@ -59,4 +59,22 @@ public class EditGridFormDTO implements Serializable {
      */
     private String mobile;
 
+    //02.21新增需求：小程序工作端添加组织增加中心点位置入口，点击进入地图选择点位，可以搜索，中心点为必填
+    //该接口为通用接口，后端暂时先不限制必填。由前端控制
+    /**
+     * 中心位置经度
+     */
+    // @NotBlank(message = "请选择网格中心点位", groups = AddGridFormDTO.AddGrid.class)
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    // @NotBlank(message = "请选择网格中心点位", groups = AddGridFormDTO.AddGrid.class)
+    private String latitude;
+
+    /**
+     * 中心点位位置
+     */
+    private String centerAddress;
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java
index cace2a4c84..99028d23bb 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java
@@ -118,4 +118,19 @@ public class AgencysResultDTO implements Serializable {
      * 联系电话
      */
     private String mobile;
+
+    /**
+     * 中心位置经度
+     */
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    private String latitude;
+
+    /**
+     * 中心点位位置
+     */
+    private String centerAddress;
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java
index f9a2726a1a..cae98d8bc4 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java
@@ -35,6 +35,11 @@ public class GridDetailResultDTO implements Serializable {
      */
     private String latitude;
 
+    /**
+     * 中心点位位置
+     */
+    private String centerAddress;
+
     /**
      * 所属地区码（所属组织地区码）
      */
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java
index cde41fbecc..fda8070609 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java
@@ -124,6 +124,11 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
 	 */
 	private String latitude;
 
+	/**
+	 * 中心点位位置
+	 */
+	private String centerAddress;
+
 	/**
 	 * 组织编码
 	 */
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java
index 49fe1b4bdb..d6018c2a29 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java
@@ -55,6 +55,11 @@ public class CustomerGridEntity extends BaseEpmetEntity {
 	 */
 	private String latitude;
 
+	/**
+	 * 中心点位位置
+	 */
+	private String centerAddress;
+
 	/**
 	 * 所属地区码（所属组织地区码）
 	 */
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
index 535d411b79..c20fd83965 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@@ -158,7 +158,13 @@ public class AgencyServiceImpl implements AgencyService {
         originalEntity.setCode(formDTO.getCode());
         originalEntity.setContacts(formDTO.getContacts());
         originalEntity.setMobile(formDTO.getMobile());
-
+        if(StringUtils.isNotBlank(formDTO.getLatitude())){
+            originalEntity.setLatitude(formDTO.getLatitude());
+        }
+        if(StringUtils.isNotBlank(formDTO.getLongitude())){
+            originalEntity.setLongitude(formDTO.getLongitude());
+        }
+        originalEntity.setCenterAddress(formDTO.getCenterAddress());
         //当前客户开启了area_code_switch参数：open: 选择地区编码必填；closed:  无需选择地区编码
         if (CustomerAgencyConstant.AREA_CODE_SWITCH_OPEN.equals(formDTO.getAreaCodeSwitch())) {
             CustomerAgencyEntity parent = customerAgencyDao.selectById(originalEntity.getPid());
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index 57fc7340fb..cd0080f548 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -272,7 +272,10 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         customerGridEntity.setGridType(addGridFormDTO.getGridType());
         customerGridEntity.setContacts(addGridFormDTO.getContacts());
         customerGridEntity.setMobile(addGridFormDTO.getMobile());
-
+        //新增网格增加中心点位必填
+        customerGridEntity.setLatitude(addGridFormDTO.getLatitude());
+        customerGridEntity.setLongitude(addGridFormDTO.getLongitude());
+        customerGridEntity.setCenterAddress(addGridFormDTO.getCenterAddress());
         //新增area_code,部门的area_code=所属组织的area_code
         customerGridEntity.setAreaCode(null != customerAgencyDTO && StringUtils.isNotBlank(customerAgencyDTO.getAreaCode()) ? customerAgencyDTO.getAreaCode() : StrConstant.EPMETY_STR);
 
@@ -314,6 +317,13 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         customerGridDTO.setGridType(editGridFormDTO.getGridType());
         customerGridDTO.setContacts(editGridFormDTO.getContacts());
         customerGridDTO.setMobile(editGridFormDTO.getMobile());
+        if(StringUtils.isNotBlank(editGridFormDTO.getLongitude())){
+            customerGridDTO.setLongitude(editGridFormDTO.getLongitude());
+        }
+        if(StringUtils.isNotBlank(editGridFormDTO.getLatitude())){
+            customerGridDTO.setLatitude(editGridFormDTO.getLatitude());
+        }
+        customerGridDTO.setCenterAddress(editGridFormDTO.getCenterAddress());
         baseDao.editGrid(customerGridDTO);
 
         return new Result();
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.12__addagency_grid_address.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.12__addagency_grid_address.sql
new file mode 100644
index 0000000000..dad5775467
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.12__addagency_grid_address.sql
@@ -0,0 +1,2 @@
+alter table customer_agency add COLUMN CENTER_ADDRESS VARCHAR(128) comment '中心点位地址' AFTER LATITUDE;
+alter table customer_grid add COLUMN CENTER_ADDRESS VARCHAR(128) comment '中心点位地址' AFTER LATITUDE;
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 623ca76ed4..357c8cebdc 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -185,6 +185,7 @@
             grid_name AS gridName,
             longitude AS longitude,
             latitude AS latitude,
+            CENTER_ADDRESS AS centerAddress,
             area_code AS areaCode,
             manage_district AS manageDistrict,
             total_user AS totalUser,
@@ -242,6 +243,15 @@
             contacts = #{contacts},
             mobile = #{mobile},
             updated_by = #{updatedBy},
+            <if test="longitude != null and longitude !=''">
+                LONGITUDE= #{longitude},
+            </if>
+            <if test="latitude != null and latitude !=''">
+                LATITUDE= #{latitude},
+            </if>
+            <if test="centerAddress != null and centerAddress !=''">
+                CENTER_ADDRESS= #{centerAddress},
+            </if>
             UPDATED_TIME=NOW()
         where
             id = #{id}