Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

# Conflicts:
#	app/controller/report_archive_controller.js

app/controller/report_archive_controller.js

@@ -413,7 +413,7 @@ module.exports = app => {
          */
         async signReport(ctx) {
             const tender = ctx.tender;
-            const stage = ctx.stage;
+            let stage = ctx.stage;
             let stage_id = -1;
             let stage_order = -1;
             let stage_times = -1;