Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: ece130eec85e81aa7221b59e7b249b44c598ddbf
+  newTag: 94f94b9853d5c9be34394ab0da356d008ecd5d3e

src/api/interface/orderManageType.ts

@@ -676,6 +676,21 @@ export type serviceOrderFormListType = InterItemFunction<
     waiting: string;
     fatherRequireId: number;
     childrenRequire?: any[];
+    createTime: string;
+    updateTime: string;
+    orderStatus: string;
+    orderRelease: {
+      userAccountId: number;
+      userName: string;
+      phoneNum: string;
+      nickName: string;
+    };
+    orderReceive: {
+      userAccountId: number;
+      userName: string;
+      phoneNum: string;
+      nickName: string;
+    };
   }[]
 >;
 // 需求订单-详情

src/pages/orderManage/demandOrder/orderList/index.tsx

@@ -166,11 +166,29 @@ const DemandOrderList = () => {
       title: '发单方信息',
       align: 'center',
       dataIndex: 'publishPhone',
+      render: (text, record) =>
+        record?.orderRelease?.phoneNum ? (
+          <>
+            <div>{record?.orderRelease?.phoneNum}</div>
+            <div>{record?.orderRelease?.userName || record?.orderRelease?.nickName}</div>
+          </>
+        ) : (
+          text
+        ),
     },
     {
       title: '接单方信息',
       align: 'center',
       dataIndex: 'preemptPhone',
+      render: (text, record) =>
+        record?.orderReceive?.phoneNum ? (
+          <>
+            <div>{record?.orderReceive?.phoneNum}</div>
+            <div>{record?.orderReceive?.userName || record?.orderReceive?.nickName}</div>
+          </>
+        ) : (
+          text
+        ),
     },
     {
       title: '订单属性',