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/DeleteStaffComponent.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/service-front/src/main/java/com/java110/front/components/DeleteStaffComponent.java b/service-front/src/main/java/com/java110/front/components/DeleteStaffComponent.java
old mode 100644
new mode 100755
index 2a6643c..2551f7b
--- a/service-front/src/main/java/com/java110/front/components/DeleteStaffComponent.java
+++ b/service-front/src/main/java/com/java110/front/components/DeleteStaffComponent.java
@@ -25,8 +25,8 @@
         } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         } finally {
-            return responseEntity;
         }
+        return responseEntity;
     }
 
     public IStaffServiceSMO getStaffServiceSMOImpl() {

--
Gitblit v1.8.0