feat: refs #8077 resolve conflict
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Robert Ferrús 2024-10-24 08:04:55 +02:00
parent 80f540a346
commit 34df4aed54
1 changed files with 1 additions and 1 deletions

View File

@ -73,7 +73,7 @@ module.exports = Self => {
pm.name payMethod, pm.name payMethod,
r.finished IS NULL hasRecovery, r.finished IS NULL hasRecovery,
dp.id departmentFk, dp.id departmentFk,
dp.name departmentName dp.name departmentName,
dp.notificationEmail departmentEmail`; dp.notificationEmail departmentEmail`;
const date = Date.vnNew(); const date = Date.vnNew();
date.setHours(0, 0, 0, 0); date.setHours(0, 0, 0, 0);