Commit Graph

12 Commits

Author SHA1 Message Date
Harryxzy 0130b83f00 Merge branch 'feature/加密方法&分页merge' into feature/V3-backItem-1215
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
2022-12-14 12:21:42 +08:00
Harryxzy c0d916c286 薪资回算功能,工资单部分 2022-12-06 15:29:08 +08:00
Harryxzy 3ff3fd8e44 薪资回算-薪资核算部分(剩余核算归档) 2022-12-02 17:35:14 +08:00
fcli fc81955b15 feat: 全部范围部分发放撤回功能 2022-11-25 10:53:23 +08:00
钱涛 e1a075cab3 fix 2022-06-22 19:26:05 +08:00
钱涛 d2a37df97f 申报表异常 2022-05-09 11:46:49 +08:00
MustangDeng 2200d0c793 工资单撤回 2022-05-09 11:18:54 +08:00
MustangDeng 3003d0fadb 生成工资单 2022-04-21 16:45:03 +08:00
MustangDeng a739d746f7 工资单发放-测试 2022-04-14 19:32:09 +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