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

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -1038,6 +1038,7 @@ export default {
       }*/
       this.sarAccessInfo = formData
       this.sarAccessInfo.page = 1
+      this.drawerPage = 1
       this.showQueryMore = false
       this.seniorQueryFlag = true
       this.selectLawsStands(1)
@@ -1106,6 +1107,7 @@ export default {
       this.seniorQueryFlag = false
       this.showTableFlag = false
       this.sarAccessInfo.page = 1
+      this.drawerPage = 1
       this.selectLawsStands()
     },
     // 点击清空查询条件 按钮事件

src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue

@@ -486,7 +486,7 @@
                             :key="opt.value"
                             :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
                     >
-                      {{ opt.label }}|
+                      {{ opt.label }}
                     </el-option>
                   </el-select>
                 </el-form-item>