Merge branch 'master' of http://10.1.235.20:3000/asiainfo/static

# Conflicts:
#	2022/aiot-evaluate/src/views/settings/ApiResourceManagement.vue

2022/aiot-evaluate/src/views/settings/ApiResourceManagement.vue

@@ -280,7 +280,6 @@ const search = (data) => {
    // page: pageData.value.page.num,
    // size: pageData.value.page.size
  };
  debugger;
  console.log(data);
  getPermissionData(params);
  // queryByType({ type: 1 });
@@ -379,7 +378,11 @@ const changePermission = async (params) => {
};
// 删除API资源
<<<<<<< HEAD
const deletePermission = async (code) => {
=======
const deletePermission = async(code) => {
>>>>>>> 2f54b06f04b53adf6a360b614dc48a6cebf7b028
  await proxy
    .$reqPost(`${proxy.$api.managementPermissionApi.deletePermission}?code=${code}`)
    .then((res) => {