From ae70754daf7c8542677d05506b066a7499ca95ad Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 30 一月 2026 08:59:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

---
 rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx b/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
index 8b9e6dd..02ecb3c 100644
--- a/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
+++ b/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
@@ -133,16 +133,16 @@
                     omit={['id', 'createTime', 'createBy', 'memo', 'updateBy', 'autoTransfer']}
                 >
                     <NumberField source="id" />
-                    <TextField source="type$" label="table.field.basStation.type" />
+                    {/* <TextField source="type$" label="table.field.basStation.type" /> */}
+                    <FunctionField
+                        source="type"
+                        label="table.field.basStation.type"
+                        render={record => record.type === 1 ? '鏅�氱珯鐐�' : '鏅鸿兘绔欑偣'}
+                    />
                     <TextField source="stationName" label="table.field.basStation.stationName" />
                     <TextField source="stationId" label="table.field.basStation.stationId" />
                     <TextField source="useStatus$" label="table.field.basStation.useStatus" />
                     <TextField source="barcode" label="table.field.basStation.barcode" />
-                    <FunctionField
-                        source="type"
-                        label="table.field.basStation.type"
-                        render={record => record.type === 1 ? '鏃犲厜鐢�' : '鍏夌數'}
-                    />
                     <FunctionField
                         source="inAble"
                         label="table.field.basStation.inAble"

--
Gitblit v1.9.1