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

doum

昨天 cff9aa6a3a5d9dab0c97cf9154382d1a69aa1cf5

 screen/src/api/index.js

@@ -221,3 +221,7 @@
export const regionDataRanking = (data) => {
  return request('visitsAdmin/cloudService/board/api/energy/regionDataRanking', data)
}
// 智能安防监测 实时在园人员
export const inParkUser = (data) => {
  return request('visitsAdmin/cloudService/board/api/fightingAdmin/inParkUser', data)
}