From 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 02 Feb 2018 11:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/app/routes/systems/organization/organization-config/organization-config.component.ts | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/routes/systems/organization/organization-config/organization-config.component.ts b/src/app/routes/systems/organization/organization-config/organization-config.component.ts
index f4cee54..34f4089 100644
--- a/src/app/routes/systems/organization/organization-config/organization-config.component.ts
+++ b/src/app/routes/systems/organization/organization-config/organization-config.component.ts
@@ -23,7 +23,7 @@
ngOnDestroy(): void {
this.backToList();
}
- private organization: Organization;
+ public organization: Organization;
grid: Grid<object> = new Grid<object>(null);
validateForm: FormGroup;
constructor(
@@ -274,8 +274,8 @@
}
}
}
- private hasDegression = false;
- refreshHasDegression(value){
+ public hasDegression = false;
+ public refreshHasDegression(value){
if(value){
this.hasDegression = true;
}else{
--
Gitblit v1.8.0