Merge remote-tracking branch 'origin/master'

yyt

2024-01-23 c80c6b24a0d76321780d71c2d4249f5144693096

 jcdm-ui/src/views/main/bs/orderScheduling/index.vue

@@ -242,7 +242,7 @@
<!--          <el-table-column label="备注" align="center" prop="remarks">-->

<!--          </el-table-column>-->
          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
<!--          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
            <template slot-scope="scope">
              <el-button
                size="mini"
@@ -263,7 +263,7 @@
                v-hasPermi="['bs:orderScheduling:remove']"
              >删除</el-button>
            </template>
          </el-table-column>
          </el-table-column>-->
        </el-table>
    </el-card>