Merge remote-tracking branch 'origin/develop' into develop

yangdelong

2021-05-26 3072da92f3c3f08b2ee0ca03ee4e74b12f545b0e

 src/assets/css/map/map-panel-style.less

@@ -828,3 +828,10 @@
  padding: 5px;
  color: #f2f2f2;
}

/************搜索数据分页功能总数量样式添加************/
.page_total {
  text-align: right;
  margin: 5px 0;
  color: @color;
}