From c09c42652e7485eb1c558752f40a3bbc35dc2946 Mon Sep 17 00:00:00 2001
From: zhangfh <jyyzzfh@126.com>
Date: Fri, 13 Aug 2021 17:52:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81=E9=81=97=E7=95=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/elink/esua/epdc/feign/AnalysisFeignClient.java     | 1 -
 epdc-cloud-client-yushan                                        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

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