钱涛 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
..
AddUpDeductionController.java	导入	2022-05-27 15:43:38 +08:00
AddUpSituationController.java	暂存	2022-05-27 14:46:01 +08:00
AttendQuoteController.java	暂存	2022-05-26 11:02:55 +08:00
OtherDeductionController.java	修复导出异常	2022-05-09 14:11:07 +08:00
SIAccountController.java	总览数据不对问题	2022-05-26 11:00:38 +08:00
SIArchivesController.java	去除run方法	2022-05-05 10:35:58 +08:00
SICategoryController.java	去除run方法	2022-05-05 10:35:58 +08:00
SIExportController.java	6个列表页导出完成	2022-04-21 15:04:35 +08:00
SIReportController.java	我的薪资列表调薪记录	2022-05-10 16:17:37 +08:00
SISchemeController.java	福利档案导出	2022-05-19 10:20:23 +08:00
SalaryAcctController.java	线下对比	2022-05-26 15:45:37 +08:00
SalaryArchiveController.java	导出日志和申报表异常	2022-05-09 10:32:14 +08:00
SalaryBillController.java	我的薪资列表工资单列表	2022-05-10 10:54:41 +08:00
SalaryFormulaController.java	权限构造	2022-04-25 18:06:09 +08:00
SalaryItemController.java	权限构造	2022-04-25 18:06:09 +08:00
SalaryProgressController.java	核算进度	2022-04-29 17:15:22 +08:00
SalarySobController.java	权限构造	2022-04-25 18:06:09 +08:00
TaxAgentController.java	暂存	2022-05-27 17:21:39 +08:00
TaxDeclarationController.java	导出日志和申报表异常	2022-05-09 10:32:14 +08:00
TaxRateController.java	暂存	2022-05-24 09:14:26 +08:00