Commit Graph

108 Commits

Author SHA1 Message Date
钱涛 eaaf69b09c Merge branch 'feature/qt' into develop 2022-03-17 15:47:31 +08:00
钱涛 5b0374ca42 分页 2022-03-17 15:47:14 +08:00
钱涛 a6bd9f38de Merge remote-tracking branch 'origin/develop' into develop 2022-03-17 15:15:00 +08:00
钱涛 2a6f3a10ce Merge branch 'feature/qt' into develop 2022-03-17 15:14:53 +08:00
钱涛 5a7cc85e53 分页 2022-03-17 15:14:35 +08:00
reset 2c23c05dee
!7 批量保存,批量删除社保档案
Merge pull request !7 from reset/archive
2022-03-16 10:28:32 +00:00
Chengliang cc9a650b92 批量保存,批量删除社保档案 2022-03-16 18:26:49 +08:00
reset 23519e2050
!6 payform 及表单组件
Merge pull request !6 from reset/archive
2022-03-16 09:06:09 +00:00
Chengliang b0124e250d 福利档案payForm及表单组件 2022-03-16 17:04:21 +08:00
钱涛 59fc1ded4e Merge branch 'feature/qt' into develop 2022-03-16 14:30:54 +08:00
钱涛 00bf811075 考勤导出接口 2022-03-16 14:29:02 +08:00
reset 112e8e9c32
福利档案获取baseForm
Merge pull request  from reset/archive
2022-03-15 09:41:43 +00:00
Chengliang 88c0cc67e6 福利档案获取baseForm 2022-03-15 17:39:19 +08:00
钱涛 1a49dd331d 考勤字段相关接口 2022-03-15 14:18:04 +08:00
Chengliang 67fe45cd2a bug修复 2022-03-15 09:56:56 +08:00
钱涛 27c9d669f7 Merge remote-tracking branch 'origin/develop' into develop 2022-03-15 09:56:30 +08:00
钱涛 eb4ca765d7 考勤相关接口 2022-03-15 09:55:58 +08:00
reset 64eff51ab2
!4 福利方案表单接口
Merge pull request !4 from reset/archive
2022-03-15 01:39:24 +00:00
Chengliang 69a1b4d5ae 福利项目表单接口修复 2022-03-15 09:34:53 +08:00
钱涛 fe14008e39 sql适配 2022-03-12 17:45:39 +08:00
钱涛 4e9d103021 fix bug 2022-03-12 14:20:39 +08:00
钱涛 3abcf90ee2 连表查询 2022-03-12 13:21:27 +08:00
钱涛 3a09014291 bug 2022-03-11 19:00:58 +08:00
钱涛 2ce8d8ca5d Merge branch 'feature/qt' into develop 2022-03-11 18:14:35 +08:00
钱涛 502450baab bug 2022-03-11 18:14:19 +08:00
reset 7c30485b88
!3 bug修复
Merge pull request !3 from reset/archive
2022-03-11 10:06:47 +00:00
Chengliang 99c9ad807f 福利方案bug修复 2022-03-11 17:46:26 +08:00
钱涛 5c1adf9774 Merge branch 'feature/qt' into develop 2022-03-11 17:27:34 +08:00
钱涛 298d432152 预览 2022-03-11 17:27:15 +08:00
钱涛 dded82ac7c Merge branch 'feature/qt' into develop 2022-03-11 17:15:43 +08:00
钱涛 7f3b381e5c 导出过滤 2022-03-11 17:15:33 +08:00
钱涛 07979a5c00 Merge branch 'feature/qt' into develop 2022-03-11 16:29:47 +08:00
钱涛 cae1b1062e 申报月份 2022-03-11 16:28:37 +08:00
钱涛 333af1c924 Merge remote-tracking branch 'origin/feature/qt' into develop 2022-03-11 16:20:05 +08:00
钱涛 1c46bd28f7 累计bug 2022-03-11 16:19:47 +08:00
钱涛 9c8238d218 Merge branch 'feature/qt' into develop 2022-03-11 15:47:35 +08:00
钱涛 692a57ae63 累计bug 2022-03-11 15:47:08 +08:00
钱涛 1a7478ff57 Merge branch 'feature/qt' into develop 2022-03-11 15:15:14 +08:00
钱涛 822f9d4289 删除本地代码 2022-03-11 15:14:32 +08:00
Chengliang c4e63e101b 表增加自增 2022-03-11 14:33:35 +08:00
Chengliang 0474872ab5 Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-03-11 14:29:08 +08:00
Chengliang f09c6d197c 福利台账listPage 2022-03-11 14:28:39 +08:00
钱涛 8aabe78182 Merge branch 'feature/qt' into develop 2022-03-11 13:45:03 +08:00
钱涛 d748f3733a 累计bug 2022-03-11 13:44:47 +08:00
钱涛 2ba52fe82b Merge remote-tracking branch 'origin/feature/qt' into develop 2022-03-11 13:20:17 +08:00
钱涛 4a15c5614b 累计bug 2022-03-11 13:20:00 +08:00
钱涛 d601f2fd59 Merge branch 'feature/qt' into develop 2022-03-11 11:09:16 +08:00
钱涛 9676102894 累计bug 2022-03-11 11:08:50 +08:00
钱涛 3f32fa98d6 累计实体错误 2022-03-11 10:18:30 +08:00
钱涛 934e9b1729 Merge branch 'feature/qt' into develop 2022-03-11 10:06:47 +08:00