Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!152

src/main/resources/mapping/kqgl/PunchRecordMapper.xml

@@ -54,7 +54,7 @@
 		<if test="param.text != null and param.text != ''" >
 		<if test="param.text != null and param.text != ''" >
 			and (info.`name` like CONCAT('%',#{param.text},'%') or info.emp_num = #{param.text})
 			and (info.`name` like CONCAT('%',#{param.text},'%') or info.emp_num = #{param.text})
 		</if>
 		</if>
-		ORDER BY dkjl.id ASC
+		ORDER BY dkjl.id DESC
   </select>
   </select>