Commit Graph

Select branches

Hide Pull Requests

dev_dxf

dev_zm

main

nb0402

shilei

#1

#2

#3

#4

Mono Color

• 1f920506ff 有效时长，计算逻辑调整 dev_dxf dxfeng 2024-07-09 16:50:59 +0800
• 32f0266e80 钉钉打卡，被覆盖代码处理 dxfeng 2024-07-09 16:36:35 +0800
• 29871495be 入职流程更新人员信息，关联关系调整 dxfeng 2024-06-17 09:36:58 +0800
• 3ffe3e7d79 有效时长，计算逻辑调整 dxfeng 2024-06-11 10:11:47 +0800
• bd464fa4fb Merge branch 'main' of http://221.226.25.34:3000/shilei/weaver-ningbojinghua into dev_dxf dxfeng 2024-05-14 15:53:29 +0800
• 42a284a4a4 Merge remote-tracking branch 'origin/main' main 李栋 2024-04-24 17:44:20 +0800
• 757d50e9bb Merge pull request '#weaver-nbjh-4# 获取请假人员的安全级别' (#4) from shilei into main shilei 2024-04-24 17:42:40 +0800
• baaf47f877 #weaver-nbjh-4# 获取请假人员的安全级别 shilei shilei 2024-04-24 17:41:30 +0800
• 3467b26296 考勤报表迟到早退自定义列使用分钟显示 李栋 2024-04-24 10:10:47 +0800
• e0aab92179 休息班扣除休息时长优化 nb0402 chenxu1234 2024-04-23 17:45:39 +0800
• 26948accc3 考勤报表关于哺乳假逻辑修改 20240411-wcf fage 2024-04-11 23:17:03 +0800
• eb89823db7 12夜补半小时加班 chenxu1234 2024-04-10 16:21:27 +0800
• 9b64172e24 优化 chenxu1234 2024-04-08 23:19:51 +0800
• 5d3a17b3b7 休息班去除休息时间移到计提之前 chenxu1234 2024-04-08 19:08:04 +0800
• 8eeb5014d0 迟到导出使用分钟显示 李栋 2024-04-08 16:48:20 +0800
• 885db4eb59 Merge pull request 'shilei' (#3) from shilei into main shilei 2024-04-03 17:01:31 +0800
• bf259a7658 #weaver-ningbojinghua-3# 修复排班的问题 shilei 2024-04-03 16:59:58 +0800
• dacdefba71 Merge remote-tracking branch 'origin/main' shilei 2024-04-03 11:20:39 +0800
• 0512c0bd61 考勤报表增加入职日期、哺乳假数据列 20240402-wcf fage 2024-04-02 17:32:30 +0800
• 2894f6dfbb no.2916227 休息日加班计算加班时长注释舍掉小数&预入职流程数据传递 chenxu1234 2024-04-02 14:41:38 +0800
• baad5c2e82 no.2916227 休息日加班计算加班时长注释舍掉小数&预入职流程数据传递 chenxu1234 2024-04-02 14:22:53 +0800
• 90951f3a0f Merge pull request '#weaver-ningbojinghua-2# 周末班加班转调休更新，去掉休息时间' (#2) from shilei into main shilei 2024-04-02 10:14:22 +0800
• a3b2973605 Merge remote-tracking branch 'origin/main' shilei 2024-04-02 10:13:59 +0800
• 07cb40acaf #weaver-ningbojinghua-2# 周末班加班转调休更新，去掉休息时间 shilei 2024-04-02 10:12:31 +0800
• 1ac74a7863 出差写入后重新格式化考勤 chenxu1234 2024-04-02 09:51:01 +0800
• 1f4865b8ca 加班台账计算有效时长 dxfeng 2024-04-01 09:49:44 +0800
• 74d0fc9a1c 入职流程更新人员照片、员工档案 dxfeng 2024-04-01 09:49:03 +0800
• 457bfa7d41 正式环境代码还原 dxfeng 2024-03-29 15:40:01 +0800
• 302a669ffa Merge branch 'main' of http://221.226.25.34:3000/shilei/weaver-ningbojinghua into dev_dxf dxfeng 2024-03-27 14:22:10 +0800
• cd125d769d Merge pull request '#weaver-ningbojinghua-1# 周末班加班问题解决' (#1) from shilei into main shilei 2024-03-26 16:58:06 +0800
• 0eaa32f888 #weaver-ningbojinghua-1# 周末班加班问题解决 shilei 2024-03-26 16:56:34 +0800
• b7823f4595 Merge branch 'main' of http://221.226.25.34:3000/shilei/weaver-ningbojinghua into dev_dxf dxfeng 2024-03-26 09:08:34 +0800
• 30a401dc01 有效时长计算 dxfeng 2024-03-26 09:08:19 +0800
• 7bf24fcaec 钉钉考勤时间格式处理JSP dxfeng 2024-03-26 09:07:55 +0800
• add5816e41 Merge remote-tracking branch 'origin/dev_zm' into dev_zm dev_zm zhangming 2024-03-22 16:59:46 +0800
• 75c116b46b 被还原代码恢复 zhangming 2024-03-22 16:59:28 +0800
• 2cfbf1683c 钉钉考勤时间格式处理 dxfeng 2024-03-22 09:24:14 +0800
• 210d1398a4 被还原代码恢复 zhangming 2024-03-22 09:15:39 +0800
• cff3198ba1 报表代码还原 李栋 2024-03-21 19:35:53 +0800
• 57a78725a6 代码修改20240320-wcf fage 2024-03-20 11:39:14 +0800
• c4161c3007 迟到使用分钟数统计 李栋 2024-03-19 18:01:41 +0800
• 20ebb8664c 检查冲突 zhangming 2024-03-19 17:48:26 +0800
• f1134534dc 周六假期字段统计优化 zhangming 2024-03-19 17:38:32 +0800
• d1ab0c1a33 svn版本 李栋 2024-03-14 18:22:23 +0800
• 1d3ff5be48 svn版本 李栋 2024-03-14 18:19:36 +0800
• 144e9a7f51 Lee 李栋 2024-03-14 18:17:21 +0800
• 1dab0ec245 Initial commit shilei 2024-03-14 18:08:18 +0800