Merge branch 'lmm' into develop

src/app/views/office-management/office-management.component.ts

@@ -512,7 +512,7 @@ export class OfficeManagementComponent implements OnInit {
       .subscribe((data) => {
         that.btnLoading = false;
         that.delModal = false;
-        if (data.status == 200) {
+        if (data.status == 200 && !data.data[0].msg) {
           if (
             that.listOfData.length == 1 &&
             that.pageIndex == Math.ceil(that.listLength / that.pageSize)
@@ -522,7 +522,7 @@ export class OfficeManagementComponent implements OnInit {
           }
           that.showPromptModal("删除", true, "");
         } else {
-          that.showPromptModal("删除", false, data.msg);
+          that.showPromptModal("删除", false, data.data[0].msg);
         }
       });
   }