Commit Graph

24 Commits

Author SHA1 Message Date
钱涛 8ff4e9e231 停薪操作 2022-09-07 09:45:37 +08:00
钱涛 3ced92cfc5 修复福利核算 2022-07-21 17:28:47 +08:00
钱涛 77ca4c2848 Merge branch 'develop' into feature/personIn2taxAgent
# Conflicts:
#	src/com/engine/salary/service/SalaryArchiveService.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
#	src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
2022-07-21 09:43:02 +08:00
钱涛 a721898d3d 薪资档案增加起始发薪和最后发薪 2022-07-18 18:08:59 +08:00
liuliang b9528442f9 薪酬档案导入对接流程-liuliang 2022-07-18 16:19:15 +08:00
liuliang 758a78996d 导入薪酬档案对接流程功能 2022-07-13 18:59:30 +08:00
钱涛 e66c86d32c fix 2022-06-01 15:18:10 +08:00
钱涛 7ffc241b0a 管理 2022-05-31 21:48:00 +08:00
钱涛 efd31013cd 薪资账套分权 2022-05-31 21:05:59 +08:00
钱涛 99b5c36864 暂存 2022-05-31 16:41:11 +08:00
钱涛 f066d1ef64 fix档案分页 2022-05-25 13:13:03 +08:00
钱涛 5c2bb1bf58 入职日期改为String 2022-04-28 10:05:27 +08:00
钱涛 c537b7d944 补充列 2022-04-19 15:13:08 +08:00
MustangDeng 775b39074d 工资单发放-工资单发放信息列表 2022-04-14 16:11:44 +08:00
钱涛 70f3239e98 查询条件 2022-04-07 20:05:58 +08:00
钱涛 77229d18a0 列表 2022-04-01 14:13:04 +08:00
钱涛 f95d8a7d0d 暂存 2022-04-01 13:50:24 +08:00
钱涛 163963d463 fix bug 2022-03-31 18:41:41 +08:00
钱涛 a8732708a8 薪资档案导入 2022-03-31 15:41:55 +08:00
钱涛 4167cb55ee 限制薪资项目的删除 2022-03-30 20:27:17 +08:00
钱涛 f8a704e66c 修改sql 2022-03-30 11:29:48 +08:00
钱涛 5c550365f1 薪资档案 2022-03-29 17:10:59 +08:00
钱涛 ba707878fc 薪资档案 2022-03-28 20:04:27 +08:00
钱涛 5ae4eb5fc8 项目id 2022-03-28 16:36:40 +08:00