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

src/pages/home2/components/releaseQA/index.vue

@@ -18,6 +18,12 @@
           width="150"
           align="center">
       </el-table-column>
+      <el-table-column
+          prop="standardEncdoing"
+          label="标准编号"
+          width="150"
+          align="center">
+      </el-table-column>
       <el-table-column
           prop="problemDescription"
           label="问题描述"

src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue

@@ -26,7 +26,7 @@
                         <el-input v-model="opinionContent.chapterName" autocomplete="off" placeholder="请输入"></el-input>
                     </el-form-item>
                     <el-form-item label="修改前" label-width="" class="add-form-item">
-                        <div v-html="opinionContent.oldText" style="margin: 56px 0 0 10px;"></div>
+                        <div v-html="opinionContent.oldText" class="itemsTextBox" style="margin: 56px 0 0 10px;"></div>
                     </el-form-item>
                     <el-form-item label="修改后" prop="newText" label-width="" class="add-form-item">
                         <el-input v-model="opinionContent.newText" autocomplete="off" placeholder="请输入"></el-input>