From 2b76c020b627ed5cba7e1e0b33b49410e45dc8a6 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 14 Mar 2018 08:58:46 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 src/app/routes/dashboard/workplace/workplace.component.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/app/routes/dashboard/workplace/workplace.component.html b/src/app/routes/dashboard/workplace/workplace.component.html
index af9599e..be53386 100644
--- a/src/app/routes/dashboard/workplace/workplace.component.html
+++ b/src/app/routes/dashboard/workplace/workplace.component.html
@@ -89,7 +89,7 @@
         </chart-card>
     </div>
     <div nz-col nzXs="24" nzSm="12" nzMd="12" nzLg="6">
-        <chart-card [title]="'���������������'" total="1,260" contentHeight="46px" [action]="action4" [footer]="footer4">
+        <chart-card [title]="'������������������'" total="1,260" contentHeight="46px" [action]="action4" [footer]="footer4">
             <ng-template #action4>
                 <nz-tooltip [nzTitle]="'������������������������������������������������'">
                     <nz-icon nz-tooltip nzType="info-circle-o"></nz-icon>

--
Gitblit v1.8.0