Merge remote-tracking branch 'origin/master'

mec-biz/src/main/resources/config/mybatis/TeacherFreeTimeMapper.xml

@@ -55,11 +55,8 @@
 			<if test="thursday != null">
 				thursday_ = #{thursday},
 			</if>
-			<if test="holiday != null">
-				holiday_ = #{holiday},
-			</if>
 			<if test="updateTime != null">
-				update_time_ = #{updateTime},
+				holiday_ = #{holiday},update_time_ = #{updateTime},
 			</if>
 			<if test="saturday != null">
 				saturday_ = #{saturday},