Merge branch 'develop' into 'master'

Develop

See merge request 8timerv2/8timerapiv200!515

src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java

@@ -1545,7 +1545,7 @@ public class SalaryManagementController {
 	
 		int gzsc = punchcarddetailsservice.selectWorkingHours(userid,startDate,endDate);
 		
-		List<PunchRecord> initial = punchrecordservice.getMaintenancePunchCardList(startDate,endDate,userid);
+		List<PunchRecord> initial = punchrecordservice.getMaintenancePunchCardList(startDate,endDate,userid,orgCode);
 		int latenum = 0;// 迟到次数
 		int latehours = 0;// 迟到时长
 		int leanum = 0;// 早退次数