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/PrivilegeGroupComponent.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/components/PrivilegeGroupComponent.java b/service-front/src/main/java/com/java110/front/components/PrivilegeGroupComponent.java
old mode 100644
new mode 100755
index d061abd..3e52897
--- a/service-front/src/main/java/com/java110/front/components/PrivilegeGroupComponent.java
+++ b/service-front/src/main/java/com/java110/front/components/PrivilegeGroupComponent.java
@@ -30,9 +30,9 @@
responseEntity = privilegeServiceSMOImpl.listPrivilegeGroup(pd);
} catch (Exception e) {
responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
- } finally {
- return responseEntity;
}
+
+ return responseEntity;
}
--
Gitblit v1.8.0