From 7722aa86f1a0e2aacbf2fd17203789619e1c64e3 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 21 Feb 2022 19:44:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/attendance/mapper/AttendanceMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/attendance/mapper/AttendanceMapper.xml b/src/main/java/org/springblade/modules/attendance/mapper/AttendanceMapper.xml
index fe61ad3..ba494cc 100644
--- a/src/main/java/org/springblade/modules/attendance/mapper/AttendanceMapper.xml
+++ b/src/main/java/org/springblade/modules/attendance/mapper/AttendanceMapper.xml
@@ -9,7 +9,7 @@
         <result column="number" property="number"/>
         <result column="department" property="department"/>
         <result column="weather" property="weather"/>
-        <result column="clockTime" property="clocktime"/>
+        <result column="clockTime" property="clockTime"/>
         <result column="jd" property="jd"/>
         <result column="wd" property="wd"/>
         <result column="clockType" property="clocktype"/>

--
Gitblit v1.9.3