解决冲突

2025-05-21 11:44:03 +08:00
parent 95e38df6a5 19974e261f
commit cbb62f2bf0
3 changed files with 1 additions and 2 deletions
--- a/package.json
+++ b/package.json
@ -20,6 +20,7 @@
    "url": "https://gitee.com/JavaLionLi/plus-ui.git"
  },
  "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
    "@element-plus/icons-vue": "2.3.1",
    "@highlightjs/vue-plugin": "2.1.0",
    "@turf/turf": "^7.2.0",
--- a/src/api/project/constructionUser/index.ts
+++ b/src/api/project/constructionUser/index.ts
@ -28,7 +28,6 @@ export const listConstructionMonth = (query?: ConstructionMonthQuery): AxiosProm
    params: query
  });
 };
-
 /**
 * 查询施工人员列表
 * @param query
--- a/src/api/project/constructionUser/types.ts
+++ b/src/api/project/constructionUser/types.ts
@ -183,7 +183,6 @@ export interface ConstructionUserVO {
   */
  createTime: string;
 }
-
 export interface skipType {
  /**
   * 项目id