Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!319

src/main/java/cn/timer/api/controller/kqgl/ClockInController.java

@@ -2078,7 +2078,7 @@ public class ClockInController {
 					pre.setMacname(clock.getMacname());
 					pre.setMac(clock.getMac());
 				}
-				pre.setCardType(cardtype);
+				pre.setCardType(clock.getPunchcardtype());
 				
 				if (!pre.insert()) {
 					throw new CustomException("打卡记录-新增异常-2");