From cb9cd49627b65a4c0e137e08063271a8cefe1826 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 23 七月 2026 17:48:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/api/mes/wm/returnissue/index.ts |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/api/mes/wm/returnissue/index.ts b/src/api/mes/wm/returnissue/index.ts
index 8bd43c3..cbb91bc 100644
--- a/src/api/mes/wm/returnissue/index.ts
+++ b/src/api/mes/wm/returnissue/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam, PageResult } from '..\..\..\..\packages\effects\request\src';
+锘縤mport type { PageParam, PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
@@ -8,10 +8,13 @@
     id?: number; // 閫�鏂欏崟缂栧彿
     code?: string; // 閫�鏂欏崟缂栧彿
     name?: string; // 閫�鏂欏崟鍚嶇О
+    taskId?: number; // 鐢熶骇浠诲姟 ID
+    taskCode?: string; // 鐢熶骇浠诲姟缂栫爜
+    taskName?: string; // 鐢熶骇浠诲姟鍚嶇О
     workstationId?: number; // 宸ヤ綔绔欑紪鍙�
     workstationName?: string; // 宸ヤ綔绔欏悕绉�
-    workOrderId?: number; // 鐢熶骇宸ュ崟缂栧彿
-    workOrderCode?: string; // 鐢熶骇宸ュ崟缂栫爜
+    workOrderId?: number; // 鐢熶骇璁㈠崟缂栧彿
+    workOrderCode?: string; // 鐢熶骇璁㈠崟缂栫爜
     type?: number; // 閫�鏂欑被鍨�
     returnDate?: number; // 閫�鏂欐棩鏈�
     status?: number; // 鍗曟嵁鐘舵��

--
Gitblit v1.9.3