Merge branch 'master' into 'hjw-onlineofficeexcel'

# Conflicts:
#   src/components/uploadDown.vue

src/pages/main/apkTestMain/index.vue

@@ -552,7 +552,7 @@
       >
         <div style="height: 100%">
           <el-form :model="addInfoList" ref="addInfoList" style="height: 100%">
-            <el-form-item prop="processUserId" style="height: 100%">
+            <el-form-item prop="processUserId" style="height: 400px;">
               <!-- <span style="width: 80px">审批人员</span> -->
               <deptTreeOnly
                 @treeCheck="treeCheckonly"

src/pages/main/terminals/advertincreases.vue

@@ -448,8 +448,8 @@ export default {
         processDefinitionKey: "ggsj_process",
       },
       requestForm: {
-          // fresourceId: "99e7da22-5f04-11ed-b399-e00084564cce", //线上环境
-        fresourceId: "e817fc35-5a51-11ed-8912-00505687dcd3", //测试环境
+          fresourceId: "99e7da22-5f04-11ed-b399-e00084564cce", //线上环境
+        // fresourceId: "e817fc35-5a51-11ed-8912-00505687dcd3", //测试环境
         // fresourceId: "3c9baf21-3e43-11ed-ad6b-d6cd97160e00",//本地环境
         processDefinitionKey: "ggsj_process",
       },

src/pages/main/terminals/components/adverts.vue

@@ -238,8 +238,8 @@ export default {
       // draftStatus:'',//起草状态更改表单状态
       uploadDownStatus: false,
       requestForm: {
-        // fresourceId: "99e7da22-5f04-11ed-b399-e00084564cce", //线上环境
-        fresourceId: "e817fc35-5a51-11ed-8912-00505687dcd3", //测试环境
+        fresourceId: "99e7da22-5f04-11ed-b399-e00084564cce", //线上环境
+        // fresourceId: "e817fc35-5a51-11ed-8912-00505687dcd3", //测试环境
         // fresourceId: "3c9baf21-3e43-11ed-ad6b-d6cd97160e00", //本地环境
         processDefinitionKey: "ggsj_process",
       },