diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
index 3746b4e..49fdfd5 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
@@ -45,7 +45,6 @@ public interface AnalysisFeignClient {
     Result<List<EpdcScreenGridGovernanceItemResultDTO>> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto);
 
     /**
-<<<<<<< HEAD
      * 网格治理-事件总览-项目类别统计
      *
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemCategoryResultDTO>>
diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index 5957c57..688b6ec 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit 5957c57819fed0daa2c811f31a9cf634e067701a
+Subproject commit 688b6ec20ea6e5868994c27d8d67cae5238654ed