From f1f78b9bae93fe9a07cc3ebdc743eb71ac78c29e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 28 May 2018 11:49:02 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 src/app/business/services/http/organization.service.ts |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/business/services/http/organization.service.ts b/src/app/business/services/http/organization.service.ts
index 0284ab9..6f3ff0b 100644
--- a/src/app/business/services/http/organization.service.ts
+++ b/src/app/business/services/http/organization.service.ts
@@ -12,11 +12,11 @@
 @Injectable()
 export class OrganizationService {
   handle: 'list'|'config' = 'list';
-  config: {pageBean: PageBean,resultBean: ResultBean<AlarmConfig>};
+  config: {pageBean: PageBean, resultBean: ResultBean<AlarmConfig>};
   data: Organization;
   title: '������������'|'������������' = '������������';
   private urls = {
-      edit: environment.SERVER_BASH_URL + '/organization/page-list',
+      list: environment.SERVER_BASH_URL + '/organization/page-list',
       save: environment.SERVER_BASH_URL + '/organization/add-or-modify',
       delete: environment.SERVER_BASH_URL + '/organization/delete-by-ids'
   };
@@ -32,7 +32,7 @@
     }
     const param: PageBean = {pageSize: page.pageSize, pageIndex: page.pageIndex, 
         queryParams: example.getSqlParam(), orderByClause: orderByClause};
-        return this.http.get(this.urls.edit, param);
+        return this.http.get(this.urls.list, param);
   }
   public save(data: any): Observable<any> {
         return this.http.post(this.urls.save, data);

--
Gitblit v1.8.0