Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

 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"/>