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

src/pages/details/otherStandardDetails/index.vue

@@ -2170,7 +2170,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
         } else {
           this.$message.error('请选择要下载的文件')
         }

src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue

@@ -83,7 +83,8 @@
           </el-table-column>
           <el-table-column label="责任人" prop="workPeople" align="center">
             <template slot-scope="scope">
-              <div :class="{'fileClass': !scope.row.workPeople}">{{ scope.row.workPeople ? scope.row.workPeople: '请选择责任人' }}</div>
+              <div :class="{'fileClass': !scope.row.workPeople}">
+                {{ scope.row.workPeople ? scope.row.workPeople: '请选择责任人' }}</div>
             </template>
           </el-table-column>
         </el-table>