From f608e00e49461f60ba8df1566fc4b9a998430ace Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期六, 03 八月 2024 21:41:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml index f319878..532522c 100644 --- a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml +++ b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml @@ -39,7 +39,8 @@ date_time, week, week_day, - name + name, + sample FROM auxiliary_output_working_hours aowh left join user on user.id=aowh.`check` WHERE 1=1 -- Gitblit v1.9.3