Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 src/api/common/other.js

@@ -1,9 +1,11 @@
// import request from "@/common/untils/request.js"
import axios from "axios"
import request from "@/common/untils/request";

// 负责人
export const getMemberListFromGrpc = async (data) => {
  return await axios.get(`/api/m/getMemberListFromGrpc`, {
// 查询公司列表
export const getCompanyList = (data) => {
  return request({
    url: "/api-wms/v1/company/company",
    method: "get",
    params: data
  })
}