From f1f08a7174e53f375b341c9bd4be50f637db2c2e Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 02 三月 2026 16:48:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

---
 rsf-admin/src/page/orders/preparation/index.jsx |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rsf-admin/src/page/orders/preparation/index.jsx b/rsf-admin/src/page/orders/preparation/index.jsx
index 6214961..8ac1ccd 100644
--- a/rsf-admin/src/page/orders/preparation/index.jsx
+++ b/rsf-admin/src/page/orders/preparation/index.jsx
@@ -5,14 +5,14 @@
     ShowGuesser,
 } from "react-admin";
 
-import MatPreparationList from "./MatPreparationList";
-// import TaskEdit from "./TaskEdit";
+import PreparationOrderList from "./PreparationOrderList";
+import PreparationOrderEdit from "./PreparationOrderEdit";
 
 export default {
-    list: MatPreparationList,
-    // edit: TaskEdit,
+    list: PreparationOrderList,
+    edit: PreparationOrderEdit,
     show: ShowGuesser,
     recordRepresentation: (record) => {
-        return `${record.id}`
+        return `${record.name}`
     }
 };

--
Gitblit v1.9.1