# Conflicts:
#	atms-web/src/main/webapp/app/common/utils/constant.js

2、模板下载

# Conflicts:
#	atms-web/src/main/webapp/app/framework/app-data-import/app-data-import.html

2、添加excel导入机构筛选

# Conflicts:
#	atms-dao/etc/generator-mysql/generatorConfig.xml

2、fixbug