Merge remote-tracking branch 'origin/master'

jiangping

2024-10-17 874b0a082a1bd12d530e0526401d3cd4d59d9d16

 admin/src/views/business/device.vue

@@ -61,7 +61,7 @@
                        </el-switch>
                    </template>
                </el-table-column>
                <el-table-column prop="no" label="设备号"></el-table-column>
                <el-table-column prop="no" width="200px" label="设备号"></el-table-column>
            </el-table>
            <pagination
                @size-change="handleSizeChange"