From 47f882588d1d18df404478bc79cc53cb608549a2 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期五, 20 八月 2021 22:20:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xinghong-dev
---
service-front/src/main/java/com/java110/front/components/NavComponent.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/components/NavComponent.java b/service-front/src/main/java/com/java110/front/components/NavComponent.java
index fb64860..784e9f5 100755
--- a/service-front/src/main/java/com/java110/front/components/NavComponent.java
+++ b/service-front/src/main/java/com/java110/front/components/NavComponent.java
@@ -69,9 +69,8 @@
responseEntity = navServiceSMOImpl.doExit(pd);
} catch (Exception e) {
responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
- } finally {
- return responseEntity;
}
+ return responseEntity;
}
/**
@@ -86,9 +85,8 @@
responseEntity = navServiceSMOImpl.getUserInfo(pd);
} catch (Exception e) {
responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
- } finally {
- return responseEntity;
}
+ return responseEntity;
}
/**
--
Gitblit v1.8.0