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

src/pages/processCenter/pages/creatProcess/bzrk/step4.vue

@@ -1301,7 +1301,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div  style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

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

@@ -492,7 +492,7 @@
           <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
         </el-form-item>
       </el-form>
-      <div class="demo-drawer-footer">
+      <div class="demo-drawer-footer" style="position: absolute;bottom: 0px">
         <el-button
           type="primary"
           class="common-button-primary"