Commit Graph

11 Commits

Author SHA1 Message Date
钱涛 01354b2be9 fix线下对比404 2022-04-27 13:33:44 +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 e672961dc2 账套-薪资项目设置,人员基本信息下拉框数据修改 2022-04-13 11:03:27 +08:00
钱涛 692c2f5a79 核算 2022-04-12 19:25:19 +08:00
钱涛 0b72b2e6cb 核算v2 2022-04-08 19:08:59 +08:00
钱涛 0dedda4dbd 核算 2022-04-07 16:54:10 +08:00
钱涛 90335032fd 调整原因 2022-04-07 11:39:22 +08:00
钱涛 e66445ce20 人员sql 2022-03-23 13:52:43 +08:00
Chengliang 88c0cc67e6 福利档案获取baseForm 2022-03-15 17:39:19 +08:00
钱涛 1c46bd28f7 累计bug 2022-03-11 16:19:47 +08:00
钱涛 c183a11cba 统一税率保存参数 2022-03-03 13:50:03 +08:00