From da0fd7be060ab4a0225c70c6572b2947484a2cb1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 31 十月 2025 09:13:13 +0800
Subject: [PATCH] Merge branch 'devlop' into devlop_whxrwms
---
rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx
index 7fa227c..3a7cdf1 100644
--- a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx
+++ b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx
@@ -147,12 +147,12 @@
preferenceKey='deviceSite'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- omit={['id', 'createTime', 'createBy', 'memo', 'label']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'label','name','target','statusBool','updateBy']}
>
<NumberField source="id" />
+ <TextField source="site" label="table.field.deviceSite.site" />
<TextField source="name" label="table.field.deviceSite.name" />
<NumberField source="type$" label="table.field.deviceSite.type" />
- <TextField source="site" label="table.field.deviceSite.site" />
<TextField source="target" label="table.field.deviceSite.target" />
<TextField source="label" label="table.field.deviceSite.label" />
<TextField source="device$" label="table.field.deviceSite.device" />
--
Gitblit v1.9.1