Merge branch 'fix' into 3.5

# Conflicts:
#	src/main/resources/mapper/store/TakeLeaveEventMapper.xml

src/main/resources/mapper/store/TakeLeaveEventMapper.xml

@@ -4,8 +4,9 @@
     <select id="appliedList" resultType="com.gogirl.domain.store.oa.TakeLeaveEvent">
         SELECT *
         from take_leave_event
-        where (start_time &lt;= #{endTime} and end_time &gt;= #{endTime}
-            or start_time &lt;= #{startTime} and start_time &gt;= #{startTime})
+        where ((start_time &lt;= #{endTime} and end_time &gt;= #{endTime})
+            or (start_time &lt; #{startTime} and start_time &gt; #{startTime})
+            or (start_time &gt;= #{startTime} and end_time &lt;= #{endTime}))
           and apply_technician_id = #{applyTechnicianId}
           and `status` != 3
     </select>