Commit Graph

46 Commits (a4cfa1d30741cbd8c52d795ebfd824cb3dcbe4f6)

Author SHA1 Message Date
Administrator fb8689160d Merge remote-tracking branch 'origin/dev' into dev 1 year ago
zhangming 280bd6d7fe 外出actionBUG修复 1 year ago
Administrator 8a94de0d05 责任制下月默认排班设置 1 year ago
Administrator 3727c0a5db Merge remote-tracking branch 'origin/dev' into dev 1 year ago
zhangming 2fa5df47ab Merge branch 'dev' of http://221.226.25.34:3000/chenwei/weaver-hostar into dev-zm
 Conflicts:
	src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java
1 year ago
zhangming e445596114 生产代码 1 year ago
Administrator c4b72324cb 去除格式化对班代码 1 year ago
Administrator 29e8b1151f Merge remote-tracking branch 'origin/dev' into dev 1 year ago
李栋 99f62328cf 考勤报表导出bug-v1.0待验证 1 year ago
Administrator 60ca792a56 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
李栋 677e414802 Revert "每日报表导出bug"
This reverts commit 04b390e0
1 year ago
李栋 52e0d2f699 Revert "每日报表导出bug"
This reverts commit 04b390e0
1 year ago
李栋 04b390e056 每日报表导出bug 1 year ago
zhangming ac4574470e 餐补报表优化 1 year ago
zhangming 7bef807a51 餐补报表优化 1 year ago
zhangming 33722523d3 餐补报表优化 1 year ago
zhangming 93a9d1f237 餐补优化 1 year ago
zhangming 9285635aee 驻点餐补BUG修复 1 year ago
Administrator 623fc926d2 打卡自动对班 1 year ago
Administrator e853bde2d5 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
zhangming 30ebc44bb8 日报优化-去除不必要日志 1 year ago
zhangming dd07f9838e Merge branch 'dev' of http://221.226.25.34:3000/chenwei/weaver-hostar into dev-zm 1 year ago
zhangming bf0c6a2b46 日报优化-去除不必要日志 1 year ago
chenwei 39c8d460cb 新增打卡地址 1 year ago
Administrator 08f0477879 考勤对班 1 year ago
chenwei 435ac5bbfa 新增打卡地址 1 year ago
chenwei 43dad8ee44 新增打卡地址 1 year ago
chenwei ccfbb426ac 新增打卡地址 1 year ago
chenwei 15ab092f8b 考勤上线后问题处理 1 year ago
chenwei 2066506e17 Merge branch 'dev' into dev-chenwnj 1 year ago
chenwei 5337fba611 考勤上线后问题处理 1 year ago
Administrator 60659fe90d 考勤格式化版本代码合并 1 year ago
Administrator 2a6faf096e 自动对班 1 year ago
chenwei ae383628d5 考勤上线后问题处理 1 year ago
chenwei 7cb5afa79d 考勤上线后问题处理 1 year ago
chenwei 98b6e1847f 考勤上线后问题处理 1 year ago
chenwei 7a0a3e889c 考勤上线后问题处理 1 year ago
chenwei 24212fc10b Merge branch 'dev-chenwnj' into dev 1 year ago
chenwei c808c6d907 考勤上线后问题处理 1 year ago
fage d2cf61fbb7 加班时长根据整点、半点计算代码修改0117 1 year ago
chenwei 81ac13a7b2 实际出勤,打卡地址 1 year ago
chenwei 4faaec7639 三种餐补 1 year ago
chenwei 321a7878d2 餐补 1 year ago
chenwei 88991c41f1 出差 1 year ago
chenwei b1fc77100f 出差流程结合外勤打卡计算考勤数据 1 year ago
chenwei fb3bf698fa 加班类型接口 1 year ago