合并代码

src/api/tower/project/model/index.ts

@@ -1,6 +1,7 @@
 import type { PageParam } from '@/api';
-import { ProjectOrder } from "@/api/tower/project/order/model";
-import { ProjectPlace } from "@/api/tower/project/place/model";
+import { ProjectOrder } from '@/api/tower/project/order/model';
+import { ProjectPlace } from '@/api/tower/project/place/model';
+import { ProjectUser } from '@/api/tower/project/user/model';
 
 interface FileItem {
   uid: number;
@@ -38,8 +39,10 @@ export interface Project {
   userId?: number;
   comments?: string;
   sortNumber?: number;
+  users?: ProjectUser[];
   orders?: ProjectOrder[];
-  places?: ProjectPlace[];
+  places1?: ProjectPlace[];
+  places2?: ProjectPlace[];
 }
 
 /**

src/api/tower/project/user/model/index.ts

@@ -13,6 +13,7 @@ export interface ProjectUser {
   avatar?: string;
   email?: string;
   phone?: string;
+  organizationName?: string;
   projectId?: number;
   status?: string;
   createTime?: string;