Merge remote-tracking branch 'origin/master'

zhuzhuanzhuan

2023-12-26 ae3ad906ed4b09f72fc716957c4dbbe16341b38f

 src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalList.vue

@@ -44,8 +44,8 @@
            </a-col>

            <a-col :md="6" :sm="6">
              <a-form-item label="设备编码">
                <a-input placeholder="请输入设备编码检索" v-model="queryParam.equipmentId"></a-input>
              <a-form-item label="统一编码">
                <a-input placeholder="请输入统一编码检索" v-model="queryParam.equipmentId"></a-input>
              </a-form-item>
            </a-col>

@@ -134,7 +134,7 @@
            }
          },{

            title: '设备编码',
            title: '统一编码',
            align: 'center',
            dataIndex: 'equipmentId',
          },