Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-19 44f9cd5c403584c39c8bb893f69244e4835daab8

 WebService/src/main/java/com/java110/web/components/EditPrivilegeGroupComponent.java

@@ -26,10 +26,10 @@
     * @param pd
     * @return
     */
    public ResponseEntity<String> savePrivilegeGroupInfo(IPageData pd){
    public ResponseEntity<String> editPrivilegeGroupInfo(IPageData pd){
        ResponseEntity<String> responseEntity = null;
        try{
            responseEntity =  privilegeServiceSMOImpl.savePrivilegeGroup(pd);
            responseEntity =  privilegeServiceSMOImpl.editPrivilegeGroup(pd);
        }catch (Exception e){
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        }finally {