瀏覽代碼

code merge

TonyKang 5 年之前
父節點
當前提交
59571cfc93
共有 1 個文件被更改,包括 0 次插入4 次删除
  1. 0 4
      app/controller/report_controller.js

+ 0 - 4
app/controller/report_controller.js

@@ -178,11 +178,7 @@ module.exports = app => {
             // console.log(roleRel);
             await encodeSignatureDataUri(roleRel, this.app.baseDir);
             await encodeDummySignatureDataUri(pageRst, this.app.baseDir);
-<<<<<<< HEAD
             const stageFlow = await ctx.service.stageAudit.getAuditGroupByListWithOwner(params.stage_id, params.stage_times);
-=======
-            const stageFlow = await ctx.service.stageAudit.getAuditors(params.stage_id, params.stage_times);
->>>>>>> 81e966af55f438d2b76c474023d1ef90bc25874d
 
             // console.log('encodeSignatureDataUri!');
             return {