From 34df4aed54a8583e8efe93b4bf2b622e02840bb4 Mon Sep 17 00:00:00 2001 From: robert Date: Thu, 24 Oct 2024 08:04:55 +0200 Subject: [PATCH] feat: refs #8077 resolve conflict --- modules/client/back/methods/defaulter/filter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/client/back/methods/defaulter/filter.js b/modules/client/back/methods/defaulter/filter.js index 98a1f7621..c38926db0 100644 --- a/modules/client/back/methods/defaulter/filter.js +++ b/modules/client/back/methods/defaulter/filter.js @@ -73,7 +73,7 @@ module.exports = Self => { pm.name payMethod, r.finished IS NULL hasRecovery, dp.id departmentFk, - dp.name departmentName + dp.name departmentName, dp.notificationEmail departmentEmail`; const date = Date.vnNew(); date.setHours(0, 0, 0, 0);