From 6a6d8512870899ff307ddecdce132b39d55a4129 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 17 Dec 2020 14:04:32 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E3=80=91-=E3=80=90=E8=8E=B7=E5=8F=96=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E8=BF=9B=E5=BA=A6=20=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=B0=83=E6=95=B4=E3=80=91-=EF=BC=88?=
 =?UTF-8?q?=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/12/17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/gird/shibei/api/impl/ShiBeiCityGridApiImpl.java  | 3 +--
 .../gird/shibei/dto/result/EventProcessResultDto.java     | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/impl/ShiBeiCityGridApiImpl.java b/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/impl/ShiBeiCityGridApiImpl.java
index f48c42e..c25672c 100644
--- a/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/impl/ShiBeiCityGridApiImpl.java
+++ b/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/impl/ShiBeiCityGridApiImpl.java
@@ -91,7 +91,6 @@ public class ShiBeiCityGridApiImpl implements ShiBeiCityGridApi {
                 e.printStackTrace();
                 LOGGER.error("事件上报返回结果处理错误：" + e.getMessage());
             }
-            return result;
         }else{
             try {
                 result = (SendEventResultDto) JSONObject.toJavaObject(res, SendEventResultDto.class);
@@ -99,8 +98,8 @@ public class ShiBeiCityGridApiImpl implements ShiBeiCityGridApi {
                 e.printStackTrace();
                 LOGGER.error("事件上报返回结果处理错误：" + e.getMessage());
             }
-            return result;
         }
+        return result;
     }
 
     @Override
diff --git a/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/result/EventProcessResultDto.java b/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/result/EventProcessResultDto.java
index 22f3d91..3adbf0c 100644
--- a/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/result/EventProcessResultDto.java
+++ b/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/result/EventProcessResultDto.java
@@ -15,25 +15,25 @@ public class EventProcessResultDto implements Serializable {
     private static final long serialVersionUID = 998896092988887280L;
 
     /**
-     *
+     *人员名称
      */
     @JSONField(name = "PARTNAME")
     private String PARTNAME;
 
     /**
-     *
+     *操作类型
      */
     @JSONField(name = "TASKCNNAME")
     private String TASKCNNAME;
 
     /**
-     *
+     *操作描述
      */
     @JSONField(name = "TASKDESC")
     private String TASKDESC;
 
     /**
-     *
+     *操作时间
      */
     @JSONField(name = "CREATEDATE")
     private String CREATEDATE;