From c5aae2302c677f8f52666a028a1561974ce6838f Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@zdjizhi.com>
Date: Fri, 22 Feb 2019 03:08:58 +0000
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1app?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=B6=8B=E5=8A=BF=E7=BB=9F=E8=AE=A1=E5=9B=BE?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0Gbps=E3=80=81PPS=E5=8D=95=E4=BD=8D=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E7=BB=9F=E8=AE=A1=EF=BC=8C=E5=AF=BC=E5=87=BA=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E5=A2=9E=E5=8A=A0=E6=A0=87=E9=A2=98=E4=B8=8E=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 2dd73adfbbc19582d2ba99073ad8e76d7671a798)

Conflicts:
	src/main/resources/nis.properties
---
 src/main/resources/nis.properties | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties
index 0b0aa278e..79a4d1813 100644
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -1243,4 +1243,8 @@ updateRegionToCommonGroup=v1/updateCommonGroupRegion
 deleteRegionToCommonGroup=v1/delCommonGroupRegion
 #\u6d41\u91cf\u7edf\u8ba1app\u8be6\u60c5\u8d8b\u52bf\u56feGbps.pps\u63a5\u53e3
 trafficAppPpsTrend=v1/trafficAppPpsTrend
+<<<<<<< develop_no_common_group
 trafficAppBpsTrend=v1/trafficAppBpsTrend
+=======
+trafficAppBpsTrend=v1/trafficAppBpsTrend
+>>>>>>> 961cd7d 流量统计app详情趋势统计图增加Gbps、PPS单位切换统计，导出图片增加标题与时间