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

src/pages/personal/pages/my-questions/index.vue

@@ -830,7 +830,7 @@
       </el-form>
     </div>
     <span>相似历史问题：</span>
-    <div  style="height: 200px; width: 80%; margin-left: 80px;">
+    <div  style="height: 200px; width: 80%; margin-left: 80px;overflow-y: auto;">
       <div v-for="item in historyList" :key="item.id" @click="historyJump(item)">
           <span class="history-item">{{item.problemDescription}}</span>
           <span class="history-item">{{item.questionTime}}</span>

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -220,7 +220,7 @@
                   align="center"
                   label="电话">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_phone" placeholder="请填写单位"/>
+                    <el-input v-model="scope.row.tel_phone" placeholder="请填写电话"/>
                   </template>
                 </el-table-column>
                 <el-table-column

src/pages/regulatoryRepository/standQA/index.vue

@@ -1068,6 +1068,7 @@ export default {
         questioner: this.$store.getters.userInfo.userId,   //提问人
         problemDescription: '',  //关键词/问题描述
       }
+      this.standSearch2()
     },
     searchBtn(){
       this.questionSerach.classification = this.activeType