Merge remote-tracking branch 'origin/dev' into dev

zhuo

2025-03-19 cc8da3c68c347ac93459bc9f3547356c84fe61f6

 src/views/CNAS/resourceDemand/device/component/resourceReservation.vue

@@ -25,7 +25,8 @@
      </el-row>
    </div>
    <div class="table-container">
      <el-table :data="tableData" border class="scrollable-table" style="width: 100%">
      <el-table :data="tableData" class="scrollable-table" style="width: 100%"
                :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
        <el-table-column label="序号"
                         type="index"
                         width="60">