Commit Graph

94 Commits

Author SHA1 Message Date
MustangDeng b850f5ad8d 工资单发放-todo 2022-04-11 14:28:45 +08:00
钱涛 cd6ad5f4be Merge branch 'feature/qt' into develop 2022-03-30 20:27:33 +08:00
钱涛 4167cb55ee 限制薪资项目的删除 2022-03-30 20:27:17 +08:00
钱涛 b30bcb8453 Merge branch 'feature/qt' into develop 2022-03-30 18:32:55 +08:00
钱涛 93686e38c5 bug 2022-03-30 18:32:44 +08:00
钱涛 94bef09608 Merge branch 'feature/qt' into develop 2022-03-30 14:56:45 +08:00
钱涛 6d61297dd1 sql修改 2022-03-30 14:56:31 +08:00
钱涛 50a62e3b29 Merge branch 'feature/qt' into develop 2022-03-30 12:16:07 +08:00
钱涛 a3604a28f0 校驗規則列表 2022-03-30 12:15:49 +08:00
钱涛 f8a704e66c 修改sql 2022-03-30 11:29:48 +08:00
钱涛 cf39049530 Merge branch 'feature/qt' into develop 2022-03-29 17:11:15 +08:00
钱涛 5c550365f1 薪资档案 2022-03-29 17:10:59 +08:00
钱涛 2a5a72f6ab Merge branch 'feature/qt' into develop 2022-03-28 20:04:51 +08:00
钱涛 ba707878fc 薪资档案 2022-03-28 20:04:27 +08:00
钱涛 019cdd9968 Merge branch 'feature/qt' into develop 2022-03-28 16:37:03 +08:00
钱涛 5ae4eb5fc8 项目id 2022-03-28 16:36:40 +08:00
钱涛 faca2d4d1b Merge branch 'feature/qt' into develop 2022-03-28 11:38:46 +08:00
钱涛 045293426c 账套校验规则 2022-03-28 11:38:33 +08:00
钱涛 c9281bd6db Merge branch 'feature/qt' into develop 2022-03-25 18:05:18 +08:00
钱涛 1db71a97ff 薪资账套 2022-03-25 18:05:07 +08:00
钱涛 cc13dd5c7b Merge branch 'feature/qt' into develop 2022-03-25 10:31:45 +08:00
钱涛 980415c8ca 账套 2022-03-25 10:31:31 +08:00
钱涛 c4142801bc Merge branch 'feature/qt' into develop 2022-03-24 20:01:56 +08:00
钱涛 f2cf03ebbf departmentIds 2022-03-24 20:01:25 +08:00
钱涛 5ad46ffabd Merge branch 'feature/qt' into develop 2022-03-24 19:42:11 +08:00
钱涛 a9d486bef6 相对更新 2022-03-24 19:42:03 +08:00
钱涛 466966dac6 Merge branch 'feature/qt' into develop 2022-03-24 17:00:08 +08:00
钱涛 83e1cf2805 相对更新 2022-03-24 16:59:52 +08:00
钱涛 288c274aaf Merge branch 'feature/qt' into develop 2022-03-23 20:54:22 +08:00
钱涛 79f9e010af 账套薪资项目 2022-03-23 20:54:08 +08:00
钱涛 00150f1696 Merge branch 'feature/qt' into develop 2022-03-23 18:41:52 +08:00
钱涛 b3d7123401 列表添加id 2022-03-23 18:41:38 +08:00
钱涛 2c65022174 Merge branch 'feature/qt' into develop 2022-03-23 13:52:58 +08:00
钱涛 e66445ce20 人员sql 2022-03-23 13:52:43 +08:00
钱涛 578b8f7aaa Merge remote-tracking branch 'origin/develop' into develop 2022-03-23 09:26:33 +08:00
钱涛 c01e63040c 薪资项目&账套 2022-03-22 21:01:38 +08:00
reset 24a5b0b48d
!12 福利档案接口
Merge pull request !12 from reset/archive
2022-03-22 11:48:54 +00:00
Chengliang 56036bf9cb 福利方案getSearchCondition接口 2022-03-22 19:47:46 +08:00
钱涛 2f8b56e4ac 参数验证类 2022-03-21 20:09:10 +08:00
钱涛 f0a0680bdc Merge branch 'feature/qt' into develop
# Conflicts:
#	src/com/engine/salary/common/BaseQueryParam.java
#	src/com/engine/salary/demo/DemoPageCmd.java
2022-03-21 09:36:56 +08:00
钱涛 f8d68fa7bc 分页 2022-03-21 09:33:21 +08:00
Chengliang 19dd1eed17 社保档案动态列接口 2022-03-18 18:00:51 +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
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