Merge remote-tracking branch 'origin/master'

zengh

2021-07-20 5f19cf4a88e41c7371f9fa4fca0bff32674fabeb

 src/api/supervisory/card.js

@@ -2,8 +2,8 @@

export const getList = (res) => {
  return request({
    url: '/api/blade-jfpts/equipment/equipment/listAll',
    url: '/api/equipment/equipment/listAll',
    method: 'get',
    params: {...res}
  })
}
}