Merge branch 'master' into dev-v1.1

zhengyiming

8 天以前 e637a51102ece68c46529ab36b5cbcedab25ae2c

 src/utils/common/area.ts

@@ -8,7 +8,7 @@

export function formatAreaListToTree(
  areaDataList: API.AreaTreeNode[],
  parentId = '',
  parentId = null,
  maxLayer = AreaType.Area
) {
  const treeNodeList: API.AreaTreeNode[] = [];