Squashed commit of the following:

合并master
commit 53c1fe55763c09030c31e5d7e188f49042b74c13
Author: Renxy <18510891294@163.com>
Date:   Fri Nov 3 16:11:37 2023 +0800

    替换合同管理中项目接口

commit 2d4b2e2def02fd364d76ae2957c288ce163a8732
Merge: 1896b02 d7159c1
Author: xujunjie <645007605@qq.com>
Date:   Fri Oct 13 18:40:18 2023 +0800

    Merge branch 'develop'

commit 1896b021573ec8c49107a6adce50aeb6886f7fd2
Merge: 2d113a3 4b025af
Author: Renxy <18510891294@163.com>
Date:   Tue Sep 12 14:06:59 2023 +0800

    Merge branch 'develop'

commit 2d113a30656e9ce1fb10f94f727cdea2dd126376
Author: Renxy <18510891294@163.com>
Date:   Wed Aug 2 15:48:44 2023 +0800

    注释cad引入

commit 5428013e7f7ee8038a3be5ddf02a13a89b663d83
Author: Renxy <18510891294@163.com>
Date:   Wed Aug 2 11:14:01 2023 +0800

    注释cad

commit 092335e291a94f9f345d29e12e4dc5c2e469e96a
Merge: c2d296e c1ae91e
Author: Renxy <18510891294@163.com>
Date:   Wed Aug 2 11:12:08 2023 +0800

    Merge branch 'develop'

commit c2d296e34621c1443ad90680a60cf664c3b1ee59
Author: Renxy <18510891294@163.com>
Date:   Tue Aug 1 16:35:47 2023 +0800

    个人中心我的审批添加发起人筛选

# Conflicts:
#	.umirc.ts
#	src/pages/Home/index.js

src/pages/ContractManager/index.jsx

@@ -15,6 +15,7 @@ import { useRequest, useModel } from '@umijs/max';
 import { connect } from 'umi';
 import {
   queryApproval,
+  queryApprovalProject,
   queryCompany,
   queryContract,
   queryContractCancel,
@@ -310,7 +311,7 @@ const ConteactManager = (props) => {
   });
 
   //请求项目列表
-  const { data: projectData } = useRequest(queryApproval, {
+  const { data: projectData } = useRequest(queryApprovalProject, {
     defaultParams: [{ pageSize: 99999 }],
   });
 
@@ -498,7 +499,7 @@ const ConteactManager = (props) => {
                 project_name: e,
               });
             }}
-            options={projectData?.list?.map((item) => {
+            options={projectData?.map((item) => {
               return {
                 value: item.project_name,
                 label: item.project_name,
@@ -589,7 +590,7 @@ const ConteactManager = (props) => {
         detail={detail}
         type={typeRef.current}
         parent_id={parentIdRef.current}
-        projectList={projectData?.list}
+        projectList={projectData}
         visible={visible}
         handleOk={handleOk}
         handleCancel={() => setVisible(false)}

src/services/contract.js

@@ -19,6 +19,13 @@ export const queryApproval = async (data) => {
   });
 };
 
+//新建合同选择项目替换成这个
+export const queryApprovalProject = async (data) => {
+  return await request('/api/v2/approval/contract-project', {
+    params: data,
+  });
+};
+
 export const querySupplierList = async (data) => {
   return await request('/api/supplier/v1/supplier/list', {
     method: 'POST',