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

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -5,7 +5,7 @@
       <div class="content-top">
         <el-form :modal="nonConformitySearch" inline class="label-input-form">
           <el-form-item label="标准号/标准名称" class="search-item">
-            <el-input v-model="nonConformitySearch.standId"
+            <el-input v-model="nonConformitySearch.standSerialNumber"
                       placeholder="请输入"
                       clearable
                       :maxlength="100"></el-input>
@@ -430,6 +430,7 @@ export default {
       pageNo: 1,
       nonConformitySearch: {
         standId: '', // 标准号/名称
+        standSerialNumber:'',
         productName: '', // 项目名称
         responsibleUnit: '' // 责任部门
       },