Commit Graph

66 Commits

Author SHA1 Message Date
钱涛 2bfd6c90a0 Merge branch 'develop' into release
# Conflicts:
#	src/com/engine/salary/service/impl/SISchemeServiceImpl.java
2022-06-06 10:23:19 +08:00
钱涛 be88b90f56 核算的分权 2022-06-02 17:10:54 +08:00
MustangDeng c55cd2d85d 工资单详情高级搜索样式优化 2022-06-02 10:34:24 +08:00
MustangDeng 4430d50492 工资单及福利问题修复 2022-06-01 14:53:16 +08:00
钱涛 efd31013cd 薪资账套分权 2022-05-31 21:05:59 +08:00
钱涛 99b5c36864 暂存 2022-05-31 16:41:11 +08:00
钱涛 e1b579d480 暂存 2022-05-25 13:10:03 +08:00
钱涛 fa4d605c8d 暂存 2022-05-18 09:19:50 +08:00
MustangDeng ee9116ae2b 工资单列表问题处理 2022-04-22 11:02:15 +08:00
钱涛 36d65de007 fix 2022-04-21 14:15:56 +08:00
MustangDeng 86d3604c7e 工资单发放-问题处理 2022-04-18 09:19:07 +08:00
MustangDeng a739d746f7 工资单发放-测试 2022-04-14 19:32:09 +08:00
MustangDeng 775b39074d 工资单发放-工资单发放信息列表 2022-04-14 16:11:44 +08:00
MustangDeng bd8305763e 工资单发放-编译 2022-04-12 10:11:53 +08:00
MustangDeng 1573abd1ee Revert "工资单发放-todo"
This reverts commit b850f5ad
2022-04-11 14:30:30 +08:00
MustangDeng b850f5ad8d 工资单发放-todo 2022-04-11 14:28:45 +08:00