Incomplete - task : 添加测试数据
Incomplete - task : 添加测试数据
Merge remote-tracking branch 'origin/master'

Conflicts:
	HC_WFFA_WEB/grails-app/domain/com/zy/wffa/pro/FileCategory.groovy
	HC_WFFA_WEB/grails-app/domain/com/zy/wffa/pro/FileSubCate.groovy
	HC_WFFA_WEB/target/classes/ApplicationResources.class
	HC_WFFA_WEB/target/classes/BootStrap$_closure1.class
	HC_WFFA_WEB/target/classes/BootStrap$_closure2.class
	HC_WFFA_WEB/target/classes/BootStrap.class
	HC_WFFA_WEB/target/classes/BuildConfig.class
	HC_WFFA_WEB/target/classes/Config$_run_closure2.class
	HC_WFFA_WEB/target/classes/Config$_run_closure3.class
	HC_WFFA_WEB/target/classes/Config$_run_closure4.class
	HC_WFFA_WEB/target/classes/Config$_run_closure4_closure7.class
	HC_WFFA_WEB/target/classes/Config$_run_closure4_closure7_closure10.class
	HC_WFFA_WEB/target/classes/Config$_run_closure4_closure8.class
	HC_WFFA_WEB/target/classes/Config$_run_closure4_closure8_closure11.class
	HC_WFFA_WEB/target/classes/Config$_run_closure4_closure9.class
	HC_WFFA_WEB/target/classes/Config$_run_closure4_closure9_closure12.class
	HC_WFFA_WEB/target/classes/Config.class
	HC_WFFA_WEB/target/classes/DataSource.class
	HC_WFFA_WEB/target/classes/LoginController.class
	HC_WFFA_WEB/target/classes/LogoutController.class
	HC_WFFA_WEB/target/classes/UrlMappings.class
	HC_WFFA_WEB/target/classes/VacationRequestBootStrap.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/indentify/AuditGroup.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/indentify/Role.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/indentify/User$__clinit__closure2.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/indentify/User$__clinit__closure3.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/indentify/User$_getAuthorities_closure1.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/indentify/User.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/indentify/UserRole.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/pro/AuditDef.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/pro/AuditObj.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/pro/CommentDesc.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/pro/CommentDescController.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/pro/ProductLine.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/pro/ProductLineController.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/pro/ProductSeries$__clinit__closure1.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/pro/ProductSeries.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/pro/ProductType$__clinit__closure1.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/pro/ProductType.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/pro/ProductTypeController.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/pro/ProductVersion$__clinit__closure1.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/pro/ProductVersion.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/service/wf/CreateProblemTrackService.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/service/wf/Test.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/system/Console.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/system/ConsoleController.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/system/FrontPage.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/system/FrontPageController.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/wf/FileAuditRequest.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/wf/FileAuditRequestController.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/wf/ListAllWf.class
	HC_WFFA_WEB/target/classes/com/zy/wffa/wf/ListAllWfController.class
	HC_WFFA_WEB/target/classes/resources.class
	HC_WFFA_WEB/target/classes/vacationRequest/MailSender.class
	HC_WFFA_WEB/target/classes/vacationRequest/VacationRequest.class
	HC_WFFA_WEB/target/classes/vacationRequest/VacationRequestController.class
	HC_WFFA_WEB/target/stacktrace.log