# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/common/util/SpringContextUtil.java
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/FormulaAgent.java
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/VatAbstractService.java
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/FSJZ.java
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/FunctionBase.java
#	atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodStandardAccountMapper.java