monitor_v3 / hg-monitor-web · Commits

…eb into master-500-log-ztq

# Conflicts:
#	hg-monitor-web-zj/src/main/resources/static/src/controller/arms.js

cmdb数据同步页优化-去掉资源分类、资源处理状态改为同步状态、同步和忽略按钮调换位置、按钮颜色、关键文本框长度调整



See merge request !575

…eb into master-500-dev-lushangqing

#872 ping详情页调整-增加表格字段采集器id collectorId #3



See merge request !574

…eb into master-500-dev-lushangqing

#872 ping详情页调整-表格字段顺序，title名称，图标更换 #2



See merge request !573

…eb into master-500-dev-lushangqing

#872 ping详情数据联调 #1



See merge request !572

…eb into master-500-dev-lushangqing