 钱涛
|
f8ecb548ed
|
Merge branch 'auth' into release
# Conflicts:
# src/com/engine/salary/biz/AddUpDeductionBiz.java
# src/com/engine/salary/biz/AddUpSituationBiz.java
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/biz/SalaryArchiveBiz.java
# src/com/engine/salary/biz/SalaryArchiveItemBiz.java
# src/com/engine/salary/biz/SalaryItemBiz.java
# src/com/engine/salary/biz/SalarySobCheckRuleBiz.java
# src/com/engine/salary/cmd/datacollection/AddUpDeductionImportCmd.java
# src/com/engine/salary/cmd/datacollection/AddUpSituationImportCmd.java
# src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
# src/com/engine/salary/enums/UserStatusEnum.java
# src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml
# src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
|
2022-05-30 18:50:00 +08:00 |
MustangDeng
|
05dc46894d
|
总览数据不对问题
|
2022-05-26 11:00:38 +08:00 |
|
钱涛
|
e1b579d480
|
暂存
|
2022-05-25 13:10:03 +08:00 |
|
MustangDeng
|
1f636c28d6
|
福利台账异动清单
|
2022-05-19 11:23:25 +08:00 |
|
MustangDeng
|
2200d0c793
|
工资单撤回
|
2022-05-09 11:18:54 +08:00 |
 Chengliang
|
fb4f1a13fb
|
提供字段描述给薪资账套
|
2022-04-27 16:21:24 +08:00 |
|
Chengliang
|
7e28c952cc
|
增加福利数据供账套使用
|
2022-04-27 14:36:05 +08:00 |
|
Chengliang
|
cd2f61be29
|
修复分页
|
2022-04-22 18:50:03 +08:00 |
|
Chengliang
|
9dc29b2b3c
|
修复xml文件报错
|
2022-04-22 16:42:06 +08:00 |
|
Chengliang
|
c2c7d2dee5
|
修复方案列表
|
2022-04-22 15:17:31 +08:00 |
|
Chengliang
|
72e9e152d6
|
福利台账相关
|
2022-04-20 19:12:01 +08:00 |
|
Chengliang
|
bef9b30a2e
|
福利台账导出及列表bug修复
|
2022-04-19 17:46:24 +08:00 |
|
Chengliang
|
0feadcf0b2
|
1
|
2022-04-19 13:32:11 +08:00 |
|
Chengliang
|
9c02c9c9fd
|
列表增加datakey
|
2022-04-19 12:19:06 +08:00 |
|
Chengliang
|
651df1842e
|
福利台账导出
|
2022-04-18 20:24:43 +08:00 |
|
Chengliang
|
2d98890c04
|
台账相关列表
|
2022-04-16 16:43:33 +08:00 |
|
Chengliang
|
9813012249
|
福利台账相关接口
|
2022-04-15 19:01:09 +08:00 |
|
Chengliang
|
6ddf60a548
|
福利台账核算接口
|
2022-04-15 13:17:25 +08:00 |
|
Chengliang
|
2eadc713e1
|
薪资台账保存核算
|
2022-04-14 11:54:16 +08:00 |
|
Chengliang
|
985456ed14
|
社保台账
|
2022-04-12 19:29:19 +08:00 |
|
Chengliang
|
0dd6f4ae35
|
福利台账
|
2022-04-12 10:24:21 +08:00 |
|
Chengliang
|
568cc1811e
|
薪资台账列表
|
2022-04-11 19:07:35 +08:00 |