钱涛 e83714ba4f Merge branch 'feature/encrypt' into release ... # Conflicts: # src/com/engine/salary/biz/AddUpSituationBiz.java # src/com/engine/salary/biz/SIArchivesBiz.java # src/com/engine/salary/cmd/datacollection/OtherDeductionGetDetailListCmd.java # src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java # src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java # src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java # src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java # src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java # src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java # src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java # src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java # src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java # src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java # src/com/engine/salary/service/impl/SISchemeServiceImpl.java # src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java # src/com/engine/salary/service/impl/TaxAgentServiceImpl.java # src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java # src/com/engine/salary/wrapper/TaxDeclarationWrapper.java		2022-06-10 15:26:43 +08:00
..
api/salary	默认不启用非标功能	2022-05-23 13:38:48 +08:00
engine/salary	Merge branch 'feature/encrypt' into release	2022-06-10 15:26:43 +08:00