Commit Graph

14 Commits

Author SHA1 Message Date
钱涛 7a817af154 档案导入 2022-10-26 13:46:36 +08:00
钱涛 b5871e1ea9 权限项 2022-06-16 14:13:22 +08:00
钱涛 382620c589 申报表 2022-06-09 19:02:18 +08:00
钱涛 fa4d605c8d 暂存 2022-05-18 09:19:50 +08:00
钱涛 bbcb5916ce 公式更换jar 2022-04-18 14:45:12 +08:00
钱涛 941a34990f Merge branch 'feature/acct' into develop
# Conflicts:
#	src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java
#	src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java
2022-04-14 20:49:24 +08:00
钱涛 4db39902b5 公式v2 2022-04-14 20:46:17 +08:00
MustangDeng 50c03b19e0 Merge branch 'develop' into feature/salaryBill
# Conflicts:
#	src/com/engine/salary/annotation/SalaryFormulaVar.java
2022-04-13 11:09:41 +08:00
MustangDeng bd8305763e 工资单发放-编译 2022-04-12 10:11:53 +08:00
钱涛 a069447f02 核算基础公式 2022-04-11 20:17:47 +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
钱涛 ba707878fc 薪资档案 2022-03-28 20:04:27 +08:00
钱涛 a35259c1ef 异常处理框架 2022-02-28 11:12:55 +08:00