Merge remote-tracking branch 'origin/master'

吴羡

3 天以前 53bc8cc8fd330d5e2a4a3698967548a0b74a395a

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

@@ -203,7 +203,7 @@
              <el-form-item label="仪器名称:" prop="deviceName">
                <el-input v-model="editData.deviceName" size="small"></el-input>
              </el-form-item>
              <el-form-item label="仪器名称EN:" prop="enDeviceName">
              <el-form-item label="仪器名称:" prop="enDeviceName">
                <el-input v-model="editData.enDeviceName" size="small"></el-input>
              </el-form-item>
            </div>