合并代码

api/app/lib/controllers/member/index.js

@@ -524,6 +524,9 @@ async function exportData (ctx) {
       ctx.body = {
          message: typeof error == 'string' ? error : undefined
       }
+   }
+}
+
 async function addMembersBulk (ctx) {
    let errorMsg = { message: '批量添加员工信息失败' };
    const transaction = await ctx.fs.dc.orm.transaction();
@@ -601,4 +604,4 @@ module.exports = {
    vacateStatistics,
    exportData,
    addMembersBulk
-};
+}