Merge remote-tracking branch 'origin/master' into xinghong-dev

xiaogang

2021-08-20 47f882588d1d18df404478bc79cc53cb608549a2

 service-front/src/main/java/com/java110/front/components/privilege/AddPrivilegeComponent.java

old mode 100644
new mode 100755
@@ -30,9 +30,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }

        return responseEntity;
    }

    public ResponseEntity<String> addPrivilegeToPrivilegeGroup(IPageData pd) {
@@ -42,8 +41,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }

    public IPrivilegeServiceSMO getPrivilegeServiceSMOImpl() {