Commit Graph

26 Commits

Author SHA1 Message Date
sy 8b1b52a6f2 薪酬系统-多语言,适配部分中文表述、薪资项目中excel函数多语言 2023-08-09 16:20:32 +08:00
sy c78c8375f0 薪酬系统-薪资核算,自定义导出字段 2023-07-12 15:20:02 +08:00
Harryxzy 76977331af 暂存 2023-06-09 17:57:17 +08:00
钱涛 ec90e31695 Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 2023-05-24 16:20:39 +08:00
钱涛 ccec800a75 公式升级 2023-05-08 11:21:09 +08:00
钱涛 8228fbf21c 短信邮件 2023-05-08 09:27:20 +08:00
钱涛 3e8ac01049 公式描述 2023-05-04 18:07:35 +08:00
钱涛 a4a829d201 年终奖数据 2023-04-11 17:24:31 +08:00
Harryxzy 3304ffdbd5 薪资核算导入,添加表头字段缓存功能 2023-03-16 16:19:23 +08:00
钱涛 857c39bd2d 年终奖 2023-01-30 17:32:58 +08:00
钱涛 d881b63327 年终奖 2023-01-29 14:58:51 +08:00
Harryxzy c0d916c286 薪资回算功能,工资单部分 2022-12-06 15:29:08 +08:00
钱涛 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