From 09e95982e57f1a26be4249d11091a935544df684 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 16 Jan 2018 16:57:25 +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 da161a8..0284ab9 100644
--- a/src/app/business/services/http/organization.service.ts
+++ b/src/app/business/services/http/organization.service.ts
@@ -1,4 +1,4 @@
-import { Organization } from '@business/entity/data';
+import { Organization, AlarmConfig } from '@business/entity/data';
import { ExampleService } from '@business/services/util/example.service';
import { _HttpClient } from '@delon/theme';
import { environment } from 'environments/environment';
@@ -6,13 +6,13 @@
import { Injectable } from '@angular/core';
import { equal } from 'assert';
import { Observable } from 'rxjs/Observable';
-import { PageBean } from '@business/entity/grid';
+import { PageBean, ResultBean } from '@business/entity/grid';
@Injectable()
export class OrganizationService {
handle: 'list'|'config' = 'list';
-
+ config: {pageBean: PageBean,resultBean: ResultBean<AlarmConfig>};
data: Organization;
title: '������������'|'������������' = '������������';
private urls = {
--
Gitblit v1.8.0