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: b2587d668e66494bfe96217234b7f1eb778644c2
+  newTag: decad6fce247d0f67aaebb7e5e3b26326ce4bda1

src/api/interface/activityManage.ts

@@ -258,6 +258,7 @@ export type mallOrderListType = InterListFunction<
     goodsUrl: string;
     needPoints: number;
     createTime: string;
+    sendUserName: string;
   }
 >;
 // 修改商品订单
@@ -272,6 +273,7 @@ export type updateGoodsOrderType = InterFunction<
     userId?: number;
     userName?: string;
     userPhone?: string;
+    sendUserName?: string;
   },
   NonNullable<unknown>
 >;

src/pages/activityManage/pointExchangeList/comp/addEditModal/index.tsx

@@ -147,6 +147,13 @@ const AddEditModalView: React.FC<ModalProps & { onCancel: () => void; data?: Det
         >
           <Input placeholder={'请输入快递单号'} maxLength={25} allowClear />
         </Form.Item>
+        <Form.Item
+          label='发货运营'
+          name='sendUserName'
+          rules={[{ required: true, message: '请输入发货运营姓名' }]}
+        >
+          <Input placeholder={'请输入发货运营姓名'} maxLength={25} allowClear />
+        </Form.Item>
       </Form>
     </Modal>
   );

src/pages/activityManage/pointExchangeList/index.tsx

@@ -110,6 +110,11 @@ const PointExchangeListPage: React.FC = () => {
       align: 'center',
     },
     {
+      title: '发货运营',
+      dataIndex: 'sendUserName',
+      align: 'center',
+    },
+    {
       title: '操作',
       dataIndex: 'id',
       align: 'center',