From 1504150a9e26ef221fc6ac4e0ad494446968d06d Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期六, 30 八月 2025 16:28:22 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx
index 3320133..3ba3c50 100644
--- a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx
+++ b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx
@@ -150,15 +150,14 @@
                     omit={['id', 'createTime', 'createBy', 'memo', 'label','name','target','statusBool','updateBy']}
                 >
                     <NumberField source="id" />
-                    <TextField source="site" label="table.field.deviceSite.site" />
+                    <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="target" label="table.field.deviceSite.target" />
                     <TextField source="label" label="table.field.deviceSite.label" />
                     <TextField source="device$" label="table.field.deviceSite.device" />
                     <TextField source="channel" label="table.field.deviceSite.channel" />
-                    <TextField source="deviceSite" label="table.field.deviceSite.deviceSite" />
+                    <TextField source="deviceSite$" label="table.field.deviceSite.deviceSite" />
                     <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                         <TextField source="nickname" />
                     </ReferenceField>

--
Gitblit v1.9.1