流量统计app详情趋势统计图增加Gbps、PPS单位切换统计,导出图片增加标题与时间
(cherry picked from commit 2dd73adfbb)
Conflicts:
src/main/resources/nis.properties
This commit is contained in:
@@ -1243,4 +1243,8 @@ updateRegionToCommonGroup=v1/updateCommonGroupRegion
|
|||||||
deleteRegionToCommonGroup=v1/delCommonGroupRegion
|
deleteRegionToCommonGroup=v1/delCommonGroupRegion
|
||||||
#\u6d41\u91cf\u7edf\u8ba1app\u8be6\u60c5\u8d8b\u52bf\u56feGbps.pps\u63a5\u53e3
|
#\u6d41\u91cf\u7edf\u8ba1app\u8be6\u60c5\u8d8b\u52bf\u56feGbps.pps\u63a5\u53e3
|
||||||
trafficAppPpsTrend=v1/trafficAppPpsTrend
|
trafficAppPpsTrend=v1/trafficAppPpsTrend
|
||||||
|
<<<<<<< develop_no_common_group
|
||||||
trafficAppBpsTrend=v1/trafficAppBpsTrend
|
trafficAppBpsTrend=v1/trafficAppBpsTrend
|
||||||
|
=======
|
||||||
|
trafficAppBpsTrend=v1/trafficAppBpsTrend
|
||||||
|
>>>>>>> 961cd7d 流量统计app详情趋势统计图增加Gbps、PPS单位切换统计,导出图片增加标题与时间
|
||||||
|
|||||||
Reference in New Issue
Block a user