Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

zhou zhou

9 小时以前 ae70754daf7c8542677d05506b066a7499ca95ad

 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"