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

maven

4 小时以前 1755192ff6533145a6ed82da31d9f7816bbe00f5

 src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue

@@ -54,8 +54,7 @@
                  style="margin-right: 30px; text-align: center; margin-bottom: 10px;"
                >
                  <div>
                    <span v-if="index === 0">发起</span>
                    <span v-else>审批</span>
                    <span>审批人</span>
                    →
                  </div>
                  <el-select