taoge_xiaodi/td_official
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
Teo
2025-05-21 11:44:03 +08:00
parent 95e38df6a5 19974e261f
commit cbb62f2bf0
3 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -20,6 +20,7 @@
"url": "https://gitee.com/JavaLionLi/plus-ui.git" "url": "https://gitee.com/JavaLionLi/plus-ui.git"
}, },
"dependencies": { "dependencies": {
"@amap/amap-jsapi-loader": "^1.0.1",
"@element-plus/icons-vue": "2.3.1", "@element-plus/icons-vue": "2.3.1",
"@highlightjs/vue-plugin": "2.1.0", "@highlightjs/vue-plugin": "2.1.0",
"@turf/turf": "^7.2.0", "@turf/turf": "^7.2.0",

1
src/api/project/constructionUser/index.ts
View File

@ -28,7 +28,6 @@ export const listConstructionMonth = (query?: ConstructionMonthQuery): AxiosProm
params: query params: query
}); });
}; };
/** /**
* 查询施工人员列表 * 查询施工人员列表
* @param query * @param query

1
src/api/project/constructionUser/types.ts
View File

@ -183,7 +183,6 @@ export interface ConstructionUserVO {
*/ */
createTime: string; createTime: string;
} }
export interface skipType { export interface skipType {
/** /**
* 项目id * 项目id