Merge remote-tracking branch 'origin/master'

zhuzhuanzhuan

2023-12-26 ae3ad906ed4b09f72fc716957c4dbbe16341b38f

 src/views/common/JSelectEquipmentModal.vue

@@ -32,9 +32,9 @@
              :md='8'
              :sm='6'
            >
              <a-form-item label='设备编码'>
              <a-form-item label='统一编码'>
                <a-input
                  placeholder='请输入设备编码'
                  placeholder='请输入统一编码'
                  v-model='queryParam.num'
                />
              </a-form-item>
@@ -104,7 +104,7 @@
          width: 50
        },
        {
          title: '设备编码',
          title: '统一编码',
          align: 'center',
          dataIndex: 'num'
        },