feat: refs #8077 resolve conflict

2024-10-24 08:04:55 +02:00 · 2024-10-24 08:04:55 +02:00 · 34df4aed54
parent 80f540a346
commit 34df4aed54
1 changed files with 1 additions and 1 deletions
--- 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);