Merge branch 'tall3' of dd.tall.wiki:ccsens_wiki/ccsenscloud into tall3

common/src/main/java/com/ccsens/common/api/TaskController.java

@@ -84,4 +84,7 @@
 //        clockingInService.punchTheClock(params.getParam(), params.getUserId());
 //        return JsonResponse.newInstance().ok();
 //    }
+//
+//
+//
 //}

common/src/main/java/com/ccsens/common/service/ClockingInService.java

@@ -204,6 +204,7 @@ public class ClockingInService implements IClockingInService {
         //驳回
         if (1 == params.getType()) {
             ProClockingIn proClockingIn = new ProClockingIn();
+            proClockingIn.setId(params.getId());
             if (ObjectUtil.isNotNull(params.getMorning())) {
                 proClockingIn.setMorningStatus((byte)2);
             }