 钱涛
|
e38841f280
|
合并auth
|
2022-05-30 18:59:48 +08:00 |
|
钱涛
|
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 |
|
钱涛
|
c6ea4c5698
|
线下对比
|
2022-05-26 15:45:37 +08:00 |
|
钱涛
|
6103c9233e
|
批量操作数量限制
|
2022-05-26 13:41:58 +08:00 |
|
钱涛
|
e1b579d480
|
暂存
|
2022-05-25 13:10:03 +08:00 |
|
钱涛
|
8b2f54afc2
|
线下对比公式详情
|
2022-04-26 16:42:22 +08:00 |
|
钱涛
|
4db39902b5
|
公式v2
|
2022-04-14 20:46:17 +08:00 |
|
钱涛
|
a2102a49b4
|
核算v3
|
2022-04-13 14:18:00 +08:00 |
|
钱涛
|
692c2f5a79
|
核算
|
2022-04-12 19:25:19 +08:00 |