{"push_id":572518121,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"b91e9d6677a3d0f8b0f9638a016bb3d01a783bf4","before":"10e3c810a9dbffc9f96d6be7b5e232e8df058958","commits":[{"sha":"76c19bf475558a71c60cd20407890310a61c0322","author":{"email":"c3e5d44d840f43def0a1b0099adc30bbe0c592aa@gmail.com","name":"Lynk"},"message":"Update.","distinct":true,"url":"https://api.github.com/repos/LynkLin/hrm-server/commits/76c19bf475558a71c60cd20407890310a61c0322"},{"sha":"b91e9d6677a3d0f8b0f9638a016bb3d01a783bf4","author":{"email":"c3e5d44d840f43def0a1b0099adc30bbe0c592aa@gmail.com","name":"Lynk"},"message":"Merge branch 'master' of https://github.com/LynkLin/hrm-server.git\n\nConflicts:\n\tsrc/main/java/com/lynk/hrm/action/PerformanceAction.java\n\tsrc/main/java/com/lynk/hrm/action/PerformanceRuleAction.java\n\tsrc/main/java/com/lynk/hrm/biz/PerformanceBiz.java\n\tsrc/main/java/com/lynk/hrm/biz/PerformanceRuleBiz.java\n\tsrc/main/java/com/lynk/hrm/biz/ZktecoTimeReportBiz.java\n\tsrc/main/java/com/lynk/hrm/biz/impl/PerformanceBizImpl.java\n\tsrc/main/java/com/lynk/hrm/biz/impl/PerformanceRuleBizImpl.java\n\tsrc/main/java/com/lynk/hrm/biz/impl/ZktecoTimeReportBizImpl.java\n\tsrc/main/java/com/lynk/hrm/dao/PerformanceMapper.java\n\tsrc/main/java/com/lynk/hrm/dao/PerformanceRuleMapper.java\n\tsrc/main/java/com/lynk/hrm/dao/ZktecoTimeReportMapper.java\n\tsrc/main/java/com/lynk/hrm/domain/PerformanceMonth.java\n\tsrc/main/java/com/lynk/hrm/domain/PerformanceRuleEmp.java\n\tsrc/main/java/com/lynk/hrm/domain/PerformanceRuleLeader.java\n\tsrc/main/java/com/lynk/hrm/domain/PerformanceScoreDept.java\n\tsrc/main/java/com/lynk/hrm/domain/PerformanceScoreDeptDetail.java\n\tsrc/main/java/com/lynk/hrm/domain/ZktecoTimeReport.java\n\tsrc/main/java/com/lynk/hrm/domain/ZktecoTimeReportCriteria.java\n\tsrc/main/java/com/lynk/hrm/task/AttendanceVacationTask.java\n\tsrc/main/java/com/lynk/hrm/task/EmployeeAgeTask.java\n\tsrc/main/java/com/lynk/hrm/task/EmployeeMonthListTask.java\n\tsrc/main/resources/config/applicationContext.xml\n\tsrc/main/resources/config/struts.xml\n\tsrc/main/resources/database/generator.xml\n\tsrc/main/resources/sqlMaps/PerformanceMapper.xml\n\tsrc/main/resources/sqlMaps/PerformanceRuleMapper.xml\n\tsrc/main/resources/sqlMaps/ZktecoReportMapper.xml\n\tsrc/main/resources/sqlMaps/ZktecoTimeReportMapper.xml","distinct":true,"url":"https://api.github.com/repos/LynkLin/hrm-server/commits/b91e9d6677a3d0f8b0f9638a016bb3d01a783bf4"}]}