钱涛 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
..
archive	oracle适配	2022-05-30 11:51:00 +08:00
attend	区时+8	2022-04-24 17:42:32 +08:00
datacollection	Merge branch 'auth' into release	2022-05-30 18:50:00 +08:00
formula	sql兼容性处理	2022-05-06 13:22:16 +08:00
salaryacct	oracle适配	2022-05-30 11:51:00 +08:00
salarybill	oracle适配	2022-05-30 11:51:00 +08:00
salaryitem	oracle适配	2022-05-30 11:51:00 +08:00
salarysob	Merge branch 'auth' into release	2022-05-30 18:50:00 +08:00
siaccount	bug修改	2022-05-30 17:31:29 +08:00
siarchives	like 修改	2022-05-30 13:43:28 +08:00
sicategory	oracle适配	2022-05-30 11:51:00 +08:00
sischeme	like 修改	2022-05-30 13:43:28 +08:00
taxagent	暂存	2022-05-26 11:02:55 +08:00
taxdeclaration	fix bug	2022-05-30 18:03:20 +08:00
InsuranceExportMapper.java	福利台账导出	2022-04-18 20:24:43 +08:00
InsuranceExportMapper.xml	修复xml文件报错	2022-04-22 16:42:06 +08:00
SysTaxRateBaseMapper.java	税率接口及相关基础类	2022-03-01 16:45:57 +08:00
SysTaxRateBaseMapper.xml	oracle适配	2022-05-30 11:51:00 +08:00
SysTaxRateDetailMapper.java	核算基础公式	2022-04-11 20:17:47 +08:00
SysTaxRateDetailMapper.xml	核算基础公式	2022-04-11 20:17:47 +08:00
TaxAgentMapper.java	核算	2022-04-07 16:54:10 +08:00
TaxAgentMapper.xml	oracle适配	2022-05-30 11:51:00 +08:00
TaxRateBaseMapper.java	税率接口及相关基础类	2022-03-01 16:45:57 +08:00
TaxRateBaseMapper.xml	oracle适配	2022-05-30 11:51:00 +08:00
TaxRateDetailMapper.java	税率接口及相关基础类	2022-03-01 16:45:57 +08:00
TaxRateDetailMapper.xml	oracle适配	2022-05-30 11:51:00 +08:00