Merge branch 'master' of https://gitea.anxinyun.cn/free-sun/HumanResource

2 years ago · e74ab3d398
2 changed files with 7 additions and 6 deletions
--- a/api/app/lib/controllers/attendance/index.js
+++ b/api/app/lib/controllers/attendance/index.js
@ -92,7 +92,7 @@ async function exportOvertimeStatistic (ctx) {
            d['sum' + overtimeTypeKey] = overtimeStatistic.reduce((sum, o) => {
               if (o.compensate == overtimeTypeKey) {
                  sum += o.duration / 3600
-                  totalDuration += o.duration / 3600
+                  // totalDuration += o.duration / 3600
               }
               return sum
            }, 0)
--- a/update_member-birthday-typetoVarchar.sql
+++ b/update_member-birthday-typetoVarchar.sql
@ -0,0 +1 @@
 alter table member alter column birthday type varchar(20) using birthday::varchar(20);
	`@ -0,0 +1 @@`
					`alter table member alter column birthday type varchar(20) using birthday::varchar(20);`