From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev

---
 service-order/src/main/java/com/java110/order/api/OrderApi.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/service-order/src/main/java/com/java110/order/api/OrderApi.java b/service-order/src/main/java/com/java110/order/api/OrderApi.java
index 3a96455..6f0d515 100755
--- a/service-order/src/main/java/com/java110/order/api/OrderApi.java
+++ b/service-order/src/main/java/com/java110/order/api/OrderApi.java
@@ -79,10 +79,9 @@
             logger.error("璇锋眰璁㈠崟寮傚父", e);
             responseEntity = new ResponseEntity<String>("璇锋眰涓績鏈嶅姟鍙戠敓寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         } finally {
-
             logger.debug("璁㈠崟鏈嶅姟杩斿洖鎶ユ枃涓�: {}", responseEntity);
-            return responseEntity;
         }
+        return responseEntity;
     }
 
     /**

--
Gitblit v1.8.0